implemented pushable entities and pushing

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index a6d292b78d757b4b694e587ca29716f2e79333fd..c565632569a766552ee4c693d6b8f963eea23f15 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -51,7 +51,8 @@ private:
        void UnloadMap();
        void LoadMap(Map *);
 
-       bool CheckBlocking() const;
+       bool CheckBlocking();
+       bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
 
        void OnTileLock();
        bool OnGridLock();
@@ -69,6 +70,7 @@ private:
        app::Application *ctrl;
        Map *map;
        Entity *controlled;
+       Entity *pushed;
        app::Timer<float> moveTimer;
        geometry::Vector<float> tempTarget;
        geometry::Vector<int> lastLock;
@@ -78,6 +80,7 @@ private:
        int nextDirection;
        bool afterLock;
        bool skipLock;
+       bool pushing;
        bool debug;
 
 };