fix substantial mistake in linker

[l2e.git] / src / map / MapState.h

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 89d235ddd631e22e0e99e93ac0d9d1b43031f950..1901a67afc4b27f0f18943c4ceab2db4aa8a8eaf 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,10 +1,17 @@
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
+namespace common {
+       struct GameConfig;
+}
+namespace map {
+       class Map;
+       class Trigger;
+}
+
 #include "Entity.h"
-#include "fwd.h"
 #include "../app/State.h"
-#include "../common/fwd.h"
+#include "../app/Timer.h"
 #include "../common/ScriptHost.h"
 #include "../common/ScriptRunner.h"
 #include "../math/Fixed.h"
@@ -65,6 +72,7 @@ private:
 
        void LockEntities();
        bool CheckMonster();
+       void LoadBattle(Entity &hero, Entity &monster);
 
        bool CheckLockTrigger();
        bool CheckMoveTrigger();
@@ -86,6 +94,7 @@ private:
        graphics::Camera camera;
        std::vector<Entity *> entities;
        math::Fixed<8> walkingSpeed;
+       app::Timer<Uint32> tileAnimation;
        int nextDirection;
        bool afterLock;
        bool skipLock;
@@ -96,4 +105,4 @@ private:
 
 }
 
-#endif /* MAP_MAPSTATE_H_ */
+#endif