X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.cpp;h=619d7e15bdb3e013eeb47e1f32ed1e67999fa1e8;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=993fad5abc00f0293175ffc635213461da0b79a6;hpb=670dd3c61cba875345b6755d41f479cff8d964c4;p=l2e.git diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp index 993fad5..619d7e1 100644 --- a/src/menu/PartyMenu.cpp +++ b/src/menu/PartyMenu.cpp @@ -8,8 +8,11 @@ #include "PartyMenu.h" #include "ChangeHero.h" +#include "ConfigMenu.h" +#include "EquipMenu.h" #include "InventoryMenu.h" #include "Resources.h" +#include "ScenarioMenu.h" #include "SelectHero.h" #include "SpellMenu.h" #include "StatusMenu.h" @@ -104,6 +107,7 @@ void PartyMenu::HandleEvents(const Input &input) { case MENU_ITEM_CAPSULE: break; case MENU_ITEM_EQUIP: + Ctrl().PushState(new SelectHero(this, this, this, OnEquipSelect)); break; case MENU_ITEM_STATUS: Ctrl().PushState(new SelectHero(this, this, this, OnStatusSelect)); @@ -112,8 +116,10 @@ void PartyMenu::HandleEvents(const Input &input) { Ctrl().PushState(new ChangeHero(this)); break; case MENU_ITEM_CONFIG: + Ctrl().PushState(new ConfigMenu(this)); break; case MENU_ITEM_SCENARIO: + Ctrl().PushState(new ScenarioMenu(this)); break; default: break; @@ -202,10 +208,10 @@ const Resources &PartyMenu::Res() const { return *game->menuResources; } -void PartyMenu::OnStatusSelect(void *ref, int index) { +void PartyMenu::OnEquipSelect(void *ref, int index) { PartyMenu *self(reinterpret_cast(ref)); self->Ctrl().ChangeState( - new StatusMenu(self, index)); + new EquipMenu(self, index)); } void PartyMenu::OnSpellSelect(void *ref, int index) { @@ -214,4 +220,10 @@ void PartyMenu::OnSpellSelect(void *ref, int index) { new SpellMenu(self, index)); } +void PartyMenu::OnStatusSelect(void *ref, int index) { + PartyMenu *self(reinterpret_cast(ref)); + self->Ctrl().ChangeState( + new StatusMenu(self, index)); +} + }