Merged the movement branch into trunk

I consider this the only way forward. In my tests this code isn't actually
doing worse than what was there before. Of course some cases are a bit broken,
and I'm open to any kind of feedback so that we can fix those issues.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 4e5664d6..ca6f4fd7 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -113,11 +113,12 @@ void Minimap::draw(gcn::Graphics *graphics)
                 break;
         }
 
-        int offset = (dotSize - 1) / 2;
+        const int offset = (dotSize - 1) / 2;
+        const Vector &pos = being->getPosition();
 
         graphics->fillRectangle(gcn::Rectangle(
-                    being->mX / 64 + getPadding() - offset,
-                    being->mY / 64 + getTitleBarHeight() - offset,
+                    (int) pos.x / 64 + getPadding() - offset,
+                    (int) pos.y / 64 + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }