X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=9654fdc841d9c987569be411e17f0719cb0634bb;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=5e68281548b4e1bc8cef7b9de7d01bb22a7cc62b;hpb=187a0f2c37bd4c1e80c5c4351aaf80695508817f;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 5e68281..9654fdc 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/ComplexAnimation.h"
+#include "../graphics/Color.h"
 #include "../graphics/Menu.h"
 
 #include <SDL.h>
@@ -19,6 +19,7 @@ namespace common {
 	class Spell;
 }
 namespace graphics {
+	class Animation;
 	class Font;
 	class Frame;
 	class Gauge;
@@ -60,19 +61,19 @@ 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;
 
-	graphics::ComplexAnimation numberAnimationPrototype;
+	const graphics::Animation *numberAnimationPrototype;
 
 	const graphics::Sprite *bigNumberSprite;
 	const graphics::Sprite *greenNumberSprite;
@@ -95,71 +96,13 @@ 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("")
-
-	, 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();
+	static void Construct(void *);
 
 };