X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=867915e928544e64c52a3b29334338d1c0cf8465;hb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;hp=3876072ecad2b7dd8aca5940579f72a458fb4824;hpb=167fe3525cd1c29cbe1a23e3b14e2a1f2774835c;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 3876072..867915e 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;
@@ -40,14 +46,32 @@ struct Resources {
 	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<const common::Item *> ikariMenuPrototype;
+
+	graphics::Sprite *weaponMenuIcon;
+	graphics::Sprite *armorMenuIcon;
+	graphics::Sprite *shieldMenuIcon;
+	graphics::Sprite *helmetMenuIcon;
+	graphics::Sprite *ringMenuIcon;
+	graphics::Sprite *jewelMenuIcon;
 
 
 	Resources()
 	: moveIcons(0)
 	, attackIcons(0)
+	, attackChoiceIcons(0)
 
 	, heroTagFrame(0)
 	, activeHeroTagFrame(0)
@@ -65,8 +89,21 @@ struct Resources {
 	, disabledFont(0)
 
 	, menuCursor(0)
+	, weaponTargetCursor(0)
+	, magicTargetCursor(0)
+	, itemTargetCursor(0)
 
 	, spellMenuHeadline("")
+	, inventory(0)
+	, itemMenuHeadline("")
+	, ikariMenuHeadline("")
+
+	, weaponMenuIcon(0)
+	, armorMenuIcon(0)
+	, shieldMenuIcon(0)
+	, helmetMenuIcon(0)
+	, ringMenuIcon(0)
+	, jewelMenuIcon(0)
 	{ }
 
 };