Fixed position of dots on minimap

Also made mPx and mPy private and synchronize with mPos on
setPosition(). The side effects of setting destination and clearing the
path have been removed from setPosition(). Only the tmwserv
PlayerHandler seemed to rely on that feature.

Mantis-issue: 672

1 files changed, 1 insertions, 6 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 93a55688..6bca796d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -119,14 +119,9 @@ void Minimap::draw(gcn::Graphics *graphics)
         if (mMapImage->getWidth() > a.width ||
             mMapImage->getHeight() > a.height)
         {
-#ifdef TMWSERV_SUPPORT
             const Vector &p = player_node->getPosition();
             mapOriginX = (int) (((a.width) / 2) - (int) (p.x * mProportion) / 32);
             mapOriginY = (int) (((a.height) / 2) - (int) (p.y * mProportion) / 32);
-#else
-            mapOriginX = (int) (((a.width) / 2) - (player_node->mX * mProportion));
-            mapOriginY = (int) (((a.height) / 2) - (player_node->mY * mProportion));
-#endif
 
             const int minOriginX = a.width - mMapImage->getWidth();
             const int minOriginY = a.height - mMapImage->getHeight();
@@ -181,7 +176,7 @@ void Minimap::draw(gcn::Graphics *graphics)
 
         graphics->fillRectangle(gcn::Rectangle(
                     (int) (pos.x * mProportion) / 32 + mapOriginX - offset,
-                    (int) (pos.x * mProportion) / 32 + mapOriginY - offset,
+                    (int) (pos.y * mProportion) / 32 + mapOriginY - offset,
                     dotSize, dotSize));
     }