X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=ec56169a1b261f87dd6d2172fbb947b2954e9e25;hb=7946f704a4cd3a985d2fb523079fce7fa14c341e;hp=382972fe271b654b5ed4c744d986265c345d6961;hpb=428ae9a4a106e54f300e95544f78044b24b7e31a;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 382972f..ec56169 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -11,6 +11,8 @@
 #include "states/SelectMoveAction.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
+#include "../common/Inventory.h"
+#include "../common/Item.h"
 #include "../geometry/operators.h"
 #include "../graphics/Sprite.h"
 
@@ -18,6 +20,8 @@
 
 using app::Application;
 using app::Input;
+using common::Inventory;
+using common::Item;
 using geometry::Point;
 using geometry::Vector;
 using graphics::Menu;
@@ -53,10 +57,27 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
 		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;
+	LoadInventory();
+}
+
+void BattleState::LoadInventory() {
+	const Inventory &inv(*res->inventory);
+	itemMenu.Clear();
+	itemMenu.Reserve(inv.MaxItems());
+	for (int i(0); i < inv.MaxItems(); ++i) {
+		const Item *item(inv.ItemAt(i));
+		if (item) {
+			itemMenu.Add(item->Name(), item, item->CanUseInBattle(), item->MenuIcon(), inv.ItemCountAt(i));
+		} else {
+			itemMenu.AddEmptyEntry();
+		}
+	}
 }
 
 void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {