X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=074578e18312252295b6da1dcb210b262243bff5;hb=536a8c96ebfec2a2b34f680d3d0b97db8e66d599;hp=365f1983305fcb3de5139b295cb89947c6db2dd0;hpb=8c055cbdddac2114c130e6a6524ff887d89ccf53;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 365f198..074578e 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -78,7 +78,12 @@ public: bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; } void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); } bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); } - const graphics::Menu GetSpellMenu() const { return spellMenus[activeHero]; } + graphics::Menu &GetSpellMenu() { return spellMenus[activeHero]; } + const graphics::Menu &GetSpellMenu() const { return spellMenus[activeHero]; } + graphics::Menu &GetIkariMenu() { return ikariMenus[activeHero]; } + const graphics::Menu &GetIkariMenu() const { return ikariMenus[activeHero]; } + graphics::Menu &GetItemMenu() { return itemMenu; } + const graphics::Menu &GetItemMenu() const { return itemMenu; } public: geometry::Vector CalculateScreenOffset(SDL_Surface *screen) const { @@ -106,6 +111,8 @@ private: std::vector monsters; std::vector heroes; std::vector > spellMenus; + graphics::Menu itemMenu; + std::vector > ikariMenus; std::vector heroTags; std::vector attackChoices; int activeHero;