From: Daniel Karbach Date: Fri, 10 Aug 2012 13:54:10 +0000 (+0200) Subject: set ikari menu to point to items X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=a45cae167c7a0608684225a7e413bf72cc6db353;p=l2e.git set ikari menu to point to items --- diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index c54feca..da3dad6 100644 --- a/src/battle/BattleState.cpp +++ b/src/battle/BattleState.cpp @@ -71,7 +71,6 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) { heroTagPositions[2] = Point(xOffset, BackgroundHeight() - tagHeight); heroTagPositions[3] = Point(xOffset + tagWidth, BackgroundHeight() - tagHeight); - // TODO: insert item menu entries itemMenu = res->itemMenuPrototype; LoadInventory(); } diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index ff0672d..ff5b624 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -95,8 +95,8 @@ public: 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 &GetIkariMenu() { return ikariMenus[activeHero]; } + const graphics::Menu &GetIkariMenu() const { return ikariMenus[activeHero]; } graphics::Menu &GetItemMenu() { return itemMenu; } const graphics::Menu &GetItemMenu() const { return itemMenu; } @@ -139,7 +139,7 @@ private: std::vector heroes; std::vector > spellMenus; graphics::Menu itemMenu; - std::vector > ikariMenus; + std::vector > ikariMenus; HeroTag heroTags[4]; geometry::Point heroTagPositions[4]; AttackChoice attackChoices[4]; diff --git a/src/battle/Resources.h b/src/battle/Resources.h index bd2fd91..5e56eb3 100644 --- a/src/battle/Resources.h +++ b/src/battle/Resources.h @@ -58,7 +58,7 @@ struct Resources { graphics::Menu itemMenuPrototype; const char *ikariMenuHeadline; - graphics::Menu ikariMenuPrototype; + graphics::Menu ikariMenuPrototype; Resources() diff --git a/src/main.cpp b/src/main.cpp index 3007436..192a5de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -405,7 +405,7 @@ int main(int argc, char **argv) { dekar.SetJewel(&krakenRock); battleRes.ikariMenuHeadline = "Please choose equipment."; - battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32); + battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32); battleRes.ikariMenuPrototype.Add("Zirco whip Thundershriek", 0, false, &swordIcon); battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon); battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon);