Merge branch 'loader'

[l2e.git] / src / battle / Resources.h

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 1e86f64ab160b1a984797801486015ebc6a3945e..719eec48f6428a94a9e126c4f908ac499c6161a1 100644 (file)
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,7 +8,9 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
-#include "../graphics/Menu.h"
+#include "../graphics/Color.h"
+
+#include <SDL.h>
 
 namespace common {
        class Inventory;
@@ -16,6 +18,7 @@ namespace common {
        class Spell;
 }
 namespace graphics {
+       class Animation;
        class Font;
        class Frame;
        class Gauge;
@@ -26,12 +29,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;
@@ -51,16 +60,23 @@ 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;
@@ -68,14 +84,33 @@ 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;
+
+       graphics::Color heroesBgColor;
+
 
        Resources()
-       : moveIcons(0)
+       : swapCursor(0)
+       , moveIcons(0)
        , attackIcons(0)
        , attackChoiceIcons(0)
 
+       , titleFrame(0)
+       , titleFont(0)
+
        , heroTagFrame(0)
        , activeHeroTagFrame(0)
+       , smallHeroTagFrame(0)
+       , lastSmallHeroTagFrame(0)
 
        , heroTagFont(0)
        , heroTagLabels(0)
@@ -95,17 +130,38 @@ struct Resources {
        , itemTargetCursor(0)
 
        , spellMenuHeadline("")
+       , spellMenuProperties(0)
        , inventory(0)
        , itemMenuHeadline("")
+       , itemMenuProperties(0)
        , ikariMenuHeadline("")
+       , ikariMenuProperties(0)
        , 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)
+
        { }
 
 };