Merge branch 'master' into menus

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

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 9654fdc841d9c987569be411e17f0719cb0634bb..a33cabf14e8d977ea30d3f33dbe3aab1f2ed8667 100644 (file)
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,28 +8,19 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
+#include "../common/fwd.h"
 #include "../graphics/Color.h"
+#include "../graphics/fwd.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;
-       class Sprite;
-}
-
 namespace battle {
 
 struct Resources {
 
+       static const int TYPE_ID = 201;
+
        graphics::Sprite *swapCursor;
        graphics::Sprite *moveIcons;
        graphics::Sprite *attackIcons;
@@ -63,7 +54,6 @@ struct Resources {
        const char *spellMenuHeadline;
        graphics::MenuProperties *spellMenuProperties;
 
-       common::Inventory *inventory;
        const char *itemMenuHeadline;
        graphics::MenuProperties *itemMenuProperties;