added attack choice icons

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 15d9d18c5b2739d0d1ed0d77c012036452b2d2a6..0c983e7fa2d964fddff019e21a962a64ef662f1b 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -51,16 +51,14 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
        heroesLayout->CalculatePositions(background->w, background->h, heroesPositions);
        attackChoices.resize(heroes.size());
        for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
-               // TODO: extract menu dimensions to resources
-               Menu</* Spell */ void *> spellMenu(res->normalFont, 12, 6, 8, 2, 32);
-               spellMenu.Add("Strong   : 3", 0);
-               spellMenu.Add("Stronger : 8", 0);
-               spellMenu.Add("Champion :16", 0);
-               spellMenu.Add("Rally    :10", 0);
-               spellMenu.Add("Valor    :30", 0);
-               spellMenus.push_back(spellMenu);
+               spellMenus.push_back(res->spellMenuPrototype);
+               // TODO: insert spell menu entries
+               ikariMenus.push_back(res->ikariMenuPrototype);
+               // TODO: insert ikari menu entries
                heroTags.push_back(HeroTag(&heroes[i], &attackChoices[i], res, HeroTag::Alignment((i + 1) % 2)));
        }
+       // TODO: insert item menu entries
+       itemMenu = res->itemMenuPrototype;
 }
 
 void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {