X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FResources.h;h=5e56eb322296445b1c8ddfc17f567d9ea81627a2;hb=fb285efc25fccb50a2f1afb96fc1afe95f2d0ef1;hp=0d18b9fbfbd8609127c25bd81f94adf45fdb5f0b;hpb=b782e097508340f375a06f0f293775eb86c3df9c;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 0d18b9f..5e56eb3 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,20 +46,25 @@ 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</* Spell */ void *> itemMenuPrototype;
+	graphics::Menu<const common::Item *> itemMenuPrototype;
 
 	const char *ikariMenuHeadline;
-	graphics::Menu</* Ikari or Item */ void *> ikariMenuPrototype;
+	graphics::Menu<const common::Item *> ikariMenuPrototype;
 
 
 	Resources()
 	: moveIcons(0)
 	, attackIcons(0)
+	, attackChoiceIcons(0)
 
 	, heroTagFrame(0)
 	, activeHeroTagFrame(0)
@@ -71,7 +82,12 @@ struct Resources {
 	, disabledFont(0)
 
 	, menuCursor(0)
+	, weaponTargetCursor(0)
+	, magicTargetCursor(0)
+	, itemTargetCursor(0)
+
 	, spellMenuHeadline("")
+	, inventory(0)
 	, itemMenuHeadline("")
 	, ikariMenuHeadline("")
 	{ }