Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 9 insertions, 2 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 55c6b3c5..4347c9cc 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -129,8 +129,14 @@ 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,10 +187,11 @@ void Minimap::draw(gcn::Graphics *graphics)
         }
 
         const int offset = (int) ((dotSize - 1) * mProportion);
+        const Vector &pos = being->getPosition();
 
         graphics->fillRectangle(gcn::Rectangle(
-                    (int) (being->mX * mProportion) + mapOriginX - offset,
-                    (int) (being->mY * mProportion) + mapOriginY - offset,
+                    (int) (pos.x * mProportion) / 32 + mapOriginX - offset,
+                    (int) (pos.x * mProportion) / 32 + mapOriginY - offset,
                     dotSize, dotSize));
     }