X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=0c983e7fa2d964fddff019e21a962a64ef662f1b;hb=b782e097508340f375a06f0f293775eb86c3df9c;hp=d7b5a075a311da997070b4d5e9a519211affeb08;hpb=2ef82e057748751f795c60dcf826a001516b5ca0;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index d7b5a07..0c983e7 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -52,28 +52,13 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	attackChoices.resize(heroes.size());
 	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
 		spellMenus.push_back(res->spellMenuPrototype);
-		// TODO: insert real spell menu entries
-		spellMenus.back().Add("Reset    : 0", 0, false);
-		spellMenus.back().Add("Strong   : 3", 0);
-		spellMenus.back().Add("Stronger : 8", 0);
-		spellMenus.back().Add("Champion :16", 0);
-		spellMenus.back().Add("Rally    :10", 0);
-		spellMenus.back().Add("Escape   : 8", 0, false);
-		spellMenus.back().Add("Valor    :30", 0);
-		spellMenus.back().Add("Poison   : 2", 0);
-		spellMenus.back().Add("Warp     : 8", 0, false);
-		spellMenus.back().Add("Release  : 2", 0);
-		spellMenus.back().Add("Waken    : 4", 0);
-		spellMenus.back().Add("Light    : 0", 0, false);
-		spellMenus.back().Add("Fake     : 4", 0);
-		spellMenus.back().Add("Trick    : 5", 0);
-		spellMenus.back().Add("Flash    : 5", 0);
-		spellMenus.back().Add("Fireball : 6", 0);
-		spellMenus.back().Add("Vortex   : 7", 0);
-		spellMenus.back().Add("Blizzard : 8", 0);
-		spellMenus.back().Add("Spark    : 3", 0);
+		// 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) {