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

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index b07e2b2..9654fdc 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,13 +8,18 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
+#include "../graphics/Color.h"
 #include "../graphics/Menu.h"
 
+#include <SDL.h>
+
 namespace common {
 	class Inventory;
 	class Item;
+	class Spell;
 }
 namespace graphics {
+	class Animation;
 	class Font;
 	class Frame;
 	class Gauge;
@@ -25,12 +30,18 @@ namespace battle {
 
 struct Resources {
 
+	graphics::Sprite *swapCursor;
 	graphics::Sprite *moveIcons;
 	graphics::Sprite *attackIcons;
 	graphics::Sprite *attackChoiceIcons;
 
+	graphics::Frame *titleFrame;
+	graphics::Font *titleFont;
+
 	graphics::Frame *heroTagFrame;
 	graphics::Frame *activeHeroTagFrame;
+	graphics::Frame *smallHeroTagFrame;
+	graphics::Frame *lastSmallHeroTagFrame;
 
 	graphics::Font *heroTagFont;
 	graphics::Sprite *heroTagLabels;
@@ -45,44 +56,53 @@ struct Resources {
 	graphics::Font *disabledFont;
 
 	graphics::Sprite *menuCursor;
+	graphics::Sprite *weaponTargetCursor;
+	graphics::Sprite *magicTargetCursor;
+	graphics::Sprite *itemTargetCursor;
 
 	const char *spellMenuHeadline;
-	graphics::Menu</* Spell */ void *> spellMenuPrototype;
+	graphics::MenuProperties *spellMenuProperties;
 
 	common::Inventory *inventory;
 	const char *itemMenuHeadline;
-	graphics::Menu<const common::Item *> itemMenuPrototype;
+	graphics::MenuProperties *itemMenuProperties;
 
 	const char *ikariMenuHeadline;
-	graphics::Menu</* Ikari or Item */ void *> ikariMenuPrototype;
+	graphics::MenuProperties *ikariMenuProperties;
+	const char *noEquipmentText;
+
+	const char *escapeText;
 
+	const graphics::Animation *numberAnimationPrototype;
 
-	Resources()
-	: moveIcons(0)
-	, attackIcons(0)
-	, attackChoiceIcons(0)
+	const graphics::Sprite *bigNumberSprite;
+	const graphics::Sprite *greenNumberSprite;
 
-	, heroTagFrame(0)
-	, activeHeroTagFrame(0)
+	graphics::Sprite *weaponMenuIcon;
+	graphics::Sprite *armorMenuIcon;
+	graphics::Sprite *shieldMenuIcon;
+	graphics::Sprite *helmetMenuIcon;
+	graphics::Sprite *ringMenuIcon;
+	graphics::Sprite *jewelMenuIcon;
 
-	, heroTagFont(0)
-	, heroTagLabels(0)
+	int levelLabelCol;
+	int levelLabelRow;
+	int healthLabelCol;
+	int healthLabelRow;
+	int manaLabelCol;
+	int manaLabelRow;
+	int moveLabelCol;
+	int moveLabelRow;
+	int ikariLabelCol;
+	int ikariLabelRow;
 
-	, healthGauge(0)
-	, manaGauge(0)
-	, ikariGauge(0)
+	graphics::Color heroesBgColor;
 
-	, selectFrame(0)
 
-	, normalFont(0)
-	, disabledFont(0)
+	Resources();
 
-	, menuCursor(0)
-	, spellMenuHeadline("")
-	, inventory(0)
-	, itemMenuHeadline("")
-	, ikariMenuHeadline("")
-	{ }
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 };