X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=1901a67afc4b27f0f18943c4ceab2db4aa8a8eaf;hb=7b3710c47f24e64e0d01378a4564730bcb2f6ef2;hp=f0f20c1ccf635379a1b0778272232e5be7840556;hpb=092a2dd175a4001a495c84ee85211734fb928c83;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index f0f20c1..1901a67 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -11,6 +11,7 @@ namespace map {
 
 #include "Entity.h"
 #include "../app/State.h"
+#include "../app/Timer.h"
 #include "../common/ScriptHost.h"
 #include "../common/ScriptRunner.h"
 #include "../math/Fixed.h"
@@ -71,6 +72,7 @@ private:
 
 	void LockEntities();
 	bool CheckMonster();
+	void LoadBattle(Entity &hero, Entity &monster);
 
 	bool CheckLockTrigger();
 	bool CheckMoveTrigger();
@@ -92,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;
@@ -102,4 +105,4 @@ private:
 
 }
 
-#endif /* MAP_MAPSTATE_H_ */
+#endif