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, 3 insertions, 4 deletions

diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 2c633b72..e9237110 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -82,10 +82,9 @@ PlayerBox::draw(gcn::Graphics *graphics)
     if (mPlayer)
     {
         // Draw character
-        int x, y, bs;
-        bs = getFrameSize();
-        x = getWidth() / 2 - 16 + bs;
-        y = getHeight() / 2 + bs;
+        const int bs = getFrameSize();
+        const int x = getWidth() / 2 + bs;
+        const int y = getHeight() - bs - 8;
         mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
     }
 }