X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=051879c36bfb88004a33bfdd66b911b9a74e825a;hb=0ad5ca97b5df217329bc319d62564a9f46ba11d7;hp=5cc8903131f84a7f625f2820a08f2da5f5b0166b;hpb=923422e6a71f57b8fa24b826d1e2914faa144081;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 5cc8903..051879c 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,19 +8,12 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
+#include "../common/fwd.h"
+#include "../graphics/Color.h"
+#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
-namespace common {
-	class Inventory;
-	class Item;
-	class Spell;
-}
-namespace graphics {
-	class Font;
-	class Frame;
-	class Gauge;
-	class Sprite;
-}
+#include <SDL.h>
 
 namespace battle {
 
@@ -36,6 +29,8 @@ struct Resources {
 
 	graphics::Frame *heroTagFrame;
 	graphics::Frame *activeHeroTagFrame;
+	graphics::Frame *smallHeroTagFrame;
+	graphics::Frame *lastSmallHeroTagFrame;
 
 	graphics::Font *heroTagFont;
 	graphics::Sprite *heroTagLabels;
@@ -55,18 +50,22 @@ 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;
@@ -74,51 +73,24 @@ struct Resources {
 	graphics::Sprite *ringMenuIcon;
 	graphics::Sprite *jewelMenuIcon;
 
+	int levelLabelCol;
+	int levelLabelRow;
+	int healthLabelCol;
+	int healthLabelRow;
+	int manaLabelCol;
+	int manaLabelRow;
+	int moveLabelCol;
+	int moveLabelRow;
+	int ikariLabelCol;
+	int ikariLabelRow;
 
-	Resources()
-	: swapCursor(0)
-	, moveIcons(0)
-	, attackIcons(0)
-	, attackChoiceIcons(0)
-
-	, titleFrame(0)
-	, titleFont(0)
-
-	, heroTagFrame(0)
-	, activeHeroTagFrame(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)
+	graphics::Color heroesBgColor;
 
-	, spellMenuHeadline("")
-	, inventory(0)
-	, itemMenuHeadline("")
-	, ikariMenuHeadline("")
-	, noEquipmentText("")
 
-	, escapeText("")
+	Resources();
 
-	, weaponMenuIcon(0)
-	, armorMenuIcon(0)
-	, shieldMenuIcon(0)
-	, helmetMenuIcon(0)
-	, ringMenuIcon(0)
-	, jewelMenuIcon(0)
-	{ }
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 };