X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.cpp;h=f3176b3f70981aa4fe66c942b3d4ea4bd9d6aa8c;hb=10a8d3a83e7ad6815bc9f752922239ef32073a5e;hp=619d7e15bdb3e013eeb47e1f32ed1e67999fa1e8;hpb=37f46a0eb5ddbf9e3de672cf6da97605e41bd1f4;p=l2e.git diff --git a/src/menu/PartyMenu.cpp b/src/menu/PartyMenu.cpp index 619d7e1..f3176b3 100644 --- a/src/menu/PartyMenu.cpp +++ b/src/menu/PartyMenu.cpp @@ -1,12 +1,6 @@ -/* - * PartyMenu.cpp - * - * Created on: Oct 21, 2012 - * Author: holy - */ - #include "PartyMenu.h" +#include "CapsuleMenu.h" #include "ChangeHero.h" #include "ConfigMenu.h" #include "EquipMenu.h" @@ -47,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); @@ -105,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));