X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=inline;f=src%2Fmap%2FMapState.cpp;h=98e9b2848b5a947f2643d1257ade0a17375ee732;hb=34e6fb59f355d1a4afc0a9a647aeb098b998dbbd;hp=e215f40f872a6b2d36aaca059761e0731c1e2d70;hpb=0fc36d261ef8129debbd4aa15594bc46cb82eb27;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index e215f40..98e9b28 100644
--- 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())));
@@ -151,6 +189,10 @@ void MapState::OnGridLock() {
 
 void MapState::LockEntities() {
 	for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+		if (*i == controlled) {
+			// don't lock player
+			continue;
+		}
 		(*i)->Position().Lock(map->Tileset()->Size());
 	}
 }