X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=0c983e7fa2d964fddff019e21a962a64ef662f1b;hb=536a8c96ebfec2a2b34f680d3d0b97db8e66d599;hp=15d9d18c5b2739d0d1ed0d77c012036452b2d2a6;hpb=8c055cbdddac2114c130e6a6524ff887d89ccf53;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 15d9d18..0c983e7 100644
--- 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) {