X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=719eec48f6428a94a9e126c4f908ac499c6161a1;hb=d5959073b2c413ba1bd6f3d14bc8bcf59304e488;hp=73b2a8f15f3a801c387925b9ce3b4bc583dd7359;hpb=04b582180c8f86f50f08f5141a2514a1fcda3e01;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 73b2a8f..719eec4 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,7 +8,7 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
-#include "../graphics/Menu.h"
+#include "../graphics/Color.h"
 
 #include <SDL.h>
 
@@ -18,6 +18,7 @@ namespace common {
 	class Spell;
 }
 namespace graphics {
+	class Animation;
 	class Font;
 	class Frame;
 	class Gauge;
@@ -59,18 +60,23 @@ struct Resources {
 	graphics::Sprite *itemTargetCursor;
 
 	const char *spellMenuHeadline;
-	graphics::Menu<const common::Spell *> spellMenuPrototype;
+	graphics::MenuProperties *spellMenuProperties;
 
 	common::Inventory *inventory;
 	const char *itemMenuHeadline;
-	graphics::Menu<const common::Item *> itemMenuPrototype;
+	graphics::MenuProperties *itemMenuProperties;
 
 	const char *ikariMenuHeadline;
-	graphics::Menu<const common::Item *> ikariMenuPrototype;
+	graphics::MenuProperties *ikariMenuProperties;
 	const char *noEquipmentText;
 
 	const char *escapeText;
 
+	const graphics::Animation *numberAnimationPrototype;
+
+	const graphics::Sprite *bigNumberSprite;
+	const graphics::Sprite *greenNumberSprite;
+
 	graphics::Sprite *weaponMenuIcon;
 	graphics::Sprite *armorMenuIcon;
 	graphics::Sprite *shieldMenuIcon;
@@ -89,7 +95,7 @@ struct Resources {
 	int ikariLabelCol;
 	int ikariLabelRow;
 
-	Uint32 heroesBgColor;
+	graphics::Color heroesBgColor;
 
 
 	Resources()
@@ -124,13 +130,20 @@ struct Resources {
 	, itemTargetCursor(0)
 
 	, spellMenuHeadline("")
+	, spellMenuProperties(0)
 	, inventory(0)
 	, itemMenuHeadline("")
+	, itemMenuProperties(0)
 	, ikariMenuHeadline("")
+	, ikariMenuProperties(0)
 	, noEquipmentText("")
 
 	, escapeText("")
 
+	, numberAnimationPrototype(0)
+	, bigNumberSprite(0)
+	, greenNumberSprite(0)
+
 	, weaponMenuIcon(0)
 	, armorMenuIcon(0)
 	, shieldMenuIcon(0)
@@ -149,7 +162,6 @@ struct Resources {
 	, ikariLabelCol(0)
 	, ikariLabelRow(0)
 
-	, heroesBgColor(0)
 	{ }
 
 };