X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;fp=src%2Fbattle%2FResources.h;h=719eec48f6428a94a9e126c4f908ac499c6161a1;hb=3ecf065f3bcef720e82bb137a2be734ed7e16746;hp=49d30c1fd49bf7693fcae0deeecd7a7e0a8c993d;hpb=1aa61eca26f5b4a4cb856a39e802f5899548b691;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 49d30c1..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>
 
@@ -60,14 +60,14 @@ 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;
@@ -95,7 +95,7 @@ struct Resources {
 	int ikariLabelCol;
 	int ikariLabelRow;
 
-	Uint32 heroesBgColor;
+	graphics::Color heroesBgColor;
 
 
 	Resources()
@@ -130,9 +130,12 @@ struct Resources {
 	, itemTargetCursor(0)
 
 	, spellMenuHeadline("")
+	, spellMenuProperties(0)
 	, inventory(0)
 	, itemMenuHeadline("")
+	, itemMenuProperties(0)
 	, ikariMenuHeadline("")
+	, ikariMenuProperties(0)
 	, noEquipmentText("")
 
 	, escapeText("")
@@ -159,7 +162,6 @@ struct Resources {
 	, ikariLabelCol(0)
 	, ikariLabelRow(0)
 
-	, heroesBgColor(0)
 	{ }
 
 };