X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=bd2fd91358839249062177d71d405ee30e316ab0;hb=b6469d8a22e60335fd8d9304569e648310ddc399;hp=098c84468f15f3e9616450f94660a9b9e5e0c41f;hpb=19e11f43c4ad3aaccce8809ba66350dd3cbeb3dd;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 098c844..bd2fd91 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -10,6 +10,11 @@
 
 #include "../graphics/Menu.h"
 
+namespace common {
+	class Inventory;
+	class Item;
+	class Spell;
+}
 namespace graphics {
 	class Font;
 	class Frame;
@@ -23,6 +28,7 @@ struct Resources {
 
 	graphics::Sprite *moveIcons;
 	graphics::Sprite *attackIcons;
+	graphics::Sprite *attackChoiceIcons;
 
 	graphics::Frame *heroTagFrame;
 	graphics::Frame *activeHeroTagFrame;
@@ -39,13 +45,26 @@ struct Resources {
 	graphics::Font *normalFont;
 	graphics::Font *disabledFont;
 
+	graphics::Sprite *menuCursor;
+	graphics::Sprite *weaponTargetCursor;
+	graphics::Sprite *magicTargetCursor;
+	graphics::Sprite *itemTargetCursor;
+
 	const char *spellMenuHeadline;
-	graphics::Menu</* Spell */ void *> spellMenuPrototype;
+	graphics::Menu<const common::Spell *> spellMenuPrototype;
+
+	common::Inventory *inventory;
+	const char *itemMenuHeadline;
+	graphics::Menu<const common::Item *> itemMenuPrototype;
+
+	const char *ikariMenuHeadline;
+	graphics::Menu</* Ikari or Item */ void *> ikariMenuPrototype;
 
 
 	Resources()
 	: moveIcons(0)
 	, attackIcons(0)
+	, attackChoiceIcons(0)
 
 	, heroTagFrame(0)
 	, activeHeroTagFrame(0)
@@ -62,7 +81,15 @@ struct Resources {
 	, normalFont(0)
 	, disabledFont(0)
 
+	, menuCursor(0)
+	, weaponTargetCursor(0)
+	, magicTargetCursor(0)
+	, itemTargetCursor(0)
+
 	, spellMenuHeadline("")
+	, inventory(0)
+	, itemMenuHeadline("")
+	, ikariMenuHeadline("")
 	{ }
 
 };