closed the gap between battle and map state (yay)

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

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 64fc8e798bde692e53b287641b2f6c79160ec2b1..051879c36bfb88004a33bfdd66b911b9a74e825a 100644 (file)
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,23 +8,13 @@
 #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 {
@@ -62,7 +52,6 @@ struct Resources {
        const char *spellMenuHeadline;
        graphics::MenuProperties *spellMenuProperties;
 
-       common::Inventory *inventory;
        const char *itemMenuHeadline;
        graphics::MenuProperties *itemMenuProperties;
 
@@ -101,6 +90,7 @@ struct Resources {
        Resources();
 
        static void CreateTypeDescription();
+       static void Construct(void *);
 
 };