check for blocking entities when trying to move

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

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 26e20da4948bec91eb126e18fb3e585ae46e923b..98e9b2848b5a947f2643d1257ade0a17375ee732 100644 (file)
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -94,22 +94,7 @@ void MapState::OnTileLock() {
        // TODO: halt all activity if lock caused a state/map transition
 
        if (nextDirection >= 0) {
-               const Tile &tile(map->TileAt(controlled->Position()));
-               bool blocked(false);
-               switch (nextDirection) {
-                       case Entity::ORIENTATION_NORTH:
-                               blocked = tile.BlocksNorth();
-                               break;
-                       case Entity::ORIENTATION_EAST:
-                               blocked = tile.BlocksEast();
-                               break;
-                       case Entity::ORIENTATION_SOUTH:
-                               blocked = tile.BlocksSouth();
-                               break;
-                       case Entity::ORIENTATION_WEST:
-                               blocked = tile.BlocksWest();
-                               break;
-               }
+               bool blocked(CheckBlocking());
                if (afterLock) {
                        OnMove(!blocked);
                        afterLock = false;
@@ -139,6 +124,59 @@ void MapState::OnTileLock() {
        lastLock = nowLock;
 }
 
+bool MapState::CheckBlocking() const {
+       const Tile &tile(map->TileAt(controlled->Position()));
+       Vector<int> nextPosition;
+       switch (nextDirection) {
+               case Entity::ORIENTATION_NORTH:
+                       if (tile.BlocksNorth()) {
+                               return true;
+                       } else {
+                               nextPosition = Vector<int>(
+                                               controlled->Position().X(),
+                                               controlled->Position().Y() - map->Tileset()->Height());
+                       }
+                       break;
+               case Entity::ORIENTATION_EAST:
+                       if (tile.BlocksEast()) {
+                               return true;
+                       } else {
+                               nextPosition = Vector<int>(
+                                               controlled->Position().X() + map->Tileset()->Width(),
+                                               controlled->Position().Y());
+                       }
+                       break;
+               case Entity::ORIENTATION_SOUTH:
+                       if (tile.BlocksSouth()) {
+                               return true;
+                       } else {
+                               nextPosition = Vector<int>(
+                                               controlled->Position().X(),
+                                               controlled->Position().Y() + map->Tileset()->Height());
+                       }
+                       break;
+               case Entity::ORIENTATION_WEST:
+                       if (tile.BlocksWest()) {
+                               return true;
+                       } else {
+                               nextPosition = Vector<int>(
+                                               controlled->Position().X() - map->Tileset()->Width(),
+                                               controlled->Position().Y());
+                       }
+                       break;
+               default:
+                       return false;
+       }
+       Vector<int> nextTileCoords(map->TileCoordinates(nextPosition));
+       for (std::vector<Entity *>::const_iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+               const Entity &e(**i);
+               if (map->TileCoordinates(e.Position()) == nextTileCoords && e.Blocking()) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 void MapState::OnGridLock() {
        LockEntities();
        Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));