X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=9a94731cd201c41eeaecd41731032b3245051e6b;hb=3565d69c463c39b05b4612ca3d3557139d91e310;hp=6ef2be748deb8e1dc874e3588f0b4326f561aa8a;hpb=1d6a9f01b8db0f5212b6a02603dd0670c6da38c7;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 6ef2be7..9a94731 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -8,6 +8,7 @@
 #include "MapState.h"
 
 #include "Map.h"
+#include "Tile.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 
@@ -54,18 +55,43 @@ void MapState::HandleEvents(const Input &input) {
 	if (!controlled) return;
 	if (!controlled->TileLock(map->Tileset()->Width(), map->Tileset()->Height())) return;
 
+	bool down(false);
 	if (input.IsDown(Input::PAD_UP)) {
 		controlled->SetOrientation(Entity::ORIENTATION_NORTH);
-		controlled->SetSpeed(walkingSpeed);
+		down = true;
 	} else if (input.IsDown(Input::PAD_RIGHT)) {
 		controlled->SetOrientation(Entity::ORIENTATION_EAST);
-		controlled->SetSpeed(walkingSpeed);
+		down = true;
 	} else if (input.IsDown(Input::PAD_DOWN)) {
 		controlled->SetOrientation(Entity::ORIENTATION_SOUTH);
-		controlled->SetSpeed(walkingSpeed);
+		down = true;
 	} else if (input.IsDown(Input::PAD_LEFT)) {
 		controlled->SetOrientation(Entity::ORIENTATION_WEST);
-		controlled->SetSpeed(walkingSpeed);
+		down = true;
+	}
+
+	if (down) {
+		const Tile &tile(map->TileAt(controlled->Position()));
+		bool blocked(false);
+		switch (controlled->GetOrientation()) {
+			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;
+		}
+		if (!blocked) {
+			controlled->SetSpeed(walkingSpeed);
+		} else {
+			controlled->SetSpeed(0.0f);
+		}
 	} else {
 		controlled->SetSpeed(0.0f);
 	}