X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.cpp;h=577772ea88eba74054987f269d3d7361500bd855;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=20a2a8ee567dd74b37734699f1577a71d42ca6d9;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp index 20a2a8e..577772e 100644 --- a/src/menu/PartyMenu.cpp +++ b/src/menu/PartyMenu.cpp @@ -1,5 +1,6 @@ #include "PartyMenu.h" +#include "CapsuleMenu.h" #include "ChangeHero.h" #include "ConfigMenu.h" #include "EquipMenu.h" @@ -13,14 +14,14 @@ #include "../app/Input.h" #include "../common/GameConfig.h" #include "../common/GameState.h" -#include "../geometry/Vector.h" +#include "../math/Vector.h" #include "../graphics/Font.h" #include "../graphics/Frame.h" #include "../graphics/Texture.h" using app::Input; using common::GameConfig; -using geometry::Vector; +using math::Vector; namespace menu { @@ -40,7 +41,7 @@ PartyMenu::PartyMenu(GameConfig *game) mainMenu.Add(Res().mainMenuStatusText, 4); mainMenu.Add(Res().mainMenuSpellText, 1); mainMenu.Add(Res().mainMenuChangeText, 5); - mainMenu.Add(Res().mainMenuCapsuleText, 2); + mainMenu.Add(Res().mainMenuCapsuleText, 2, game->state->capsule); mainMenu.Add(Res().mainMenuConfigText, 6); mainMenu.Add(Res().mainMenuEquipmentText, 3); mainMenu.Add(Res().mainMenuScenarioText, 7); @@ -98,6 +99,11 @@ void PartyMenu::HandleEvents(const Input &input) { Ctrl().PushState(new SelectHero(this, this, this, OnSpellSelect)); break; case MENU_ITEM_CAPSULE: + if (game->state->capsule) { + Ctrl().PushState(new CapsuleMenu(this)); + } else { + // noise and blur + } break; case MENU_ITEM_EQUIP: Ctrl().PushState(new SelectHero(this, this, this, OnEquipSelect));