X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=64fc8e798bde692e53b287641b2f6c79160ec2b1;hb=d6d77b62f44e04f2bae82017961c5e4b9b1f31b5;hp=49d30c1fd49bf7693fcae0deeecd7a7e0a8c993d;hpb=7cabfe225d70f2a7c0770fde3091e744fc0e4dd2;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 49d30c1..64fc8e7 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,72 +95,12 @@ struct Resources {
 	int ikariLabelCol;
 	int ikariLabelRow;
 
-	Uint32 heroesBgColor;
+	graphics::Color heroesBgColor;
 
 
-	Resources()
-	: swapCursor(0)
-	, moveIcons(0)
-	, attackIcons(0)
-	, attackChoiceIcons(0)
+	Resources();
 
-	, titleFrame(0)
-	, titleFont(0)
-
-	, heroTagFrame(0)
-	, activeHeroTagFrame(0)
-	, smallHeroTagFrame(0)
-	, lastSmallHeroTagFrame(0)
-
-	, heroTagFont(0)
-	, heroTagLabels(0)
-
-	, healthGauge(0)
-	, manaGauge(0)
-	, ikariGauge(0)
-
-	, selectFrame(0)
-
-	, normalFont(0)
-	, disabledFont(0)
-
-	, menuCursor(0)
-	, weaponTargetCursor(0)
-	, magicTargetCursor(0)
-	, itemTargetCursor(0)
-
-	, spellMenuHeadline("")
-	, inventory(0)
-	, itemMenuHeadline("")
-	, ikariMenuHeadline("")
-	, noEquipmentText("")
-
-	, escapeText("")
-
-	, numberAnimationPrototype(0)
-	, bigNumberSprite(0)
-	, greenNumberSprite(0)
-
-	, weaponMenuIcon(0)
-	, armorMenuIcon(0)
-	, shieldMenuIcon(0)
-	, helmetMenuIcon(0)
-	, ringMenuIcon(0)
-	, jewelMenuIcon(0)
-
-	, levelLabelCol(0)
-	, levelLabelRow(0)
-	, healthLabelCol(0)
-	, healthLabelRow(0)
-	, manaLabelCol(0)
-	, manaLabelRow(0)
-	, moveLabelCol(0)
-	, moveLabelRow(0)
-	, ikariLabelCol(0)
-	, ikariLabelRow(0)
-
-	, heroesBgColor(0)
-	{ }
+	static void CreateTypeDescription();
 
 };