From e42e6570cb7460a1794fdc674d875a2b798d4f43 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 5 Oct 2012 17:03:33 +0200
Subject: [PATCH] don't lock player character onto its tile

---
 src/map/MapState.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index e215f40..26e20da 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -151,6 +151,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());
 	}
 }
-- 
2.39.2