Made the client use a unique kind of movement code.

This is fixng many issues and (hopefully) will make the movement
rendering much smoother.

Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge

Conflicts:
	src/being.cpp
	src/net/manaserv/beinghandler.cpp

Resolves: TMW-Mantis #946.

Reviewed-by: Thorbjorn.

1 files changed, 28 insertions, 3 deletions

diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index e86f9afa..4249bac8 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -412,10 +412,35 @@ int PlayerHandler::getJobLocation()
     return -1;
 }
 
-Vector PlayerHandler::getDefaultWalkSpeed()
+Vector PlayerHandler::getDefaultMoveSpeed() const
 {
-    // Return translation in pixels per ticks.
-    return ManaServ::BeingHandler::giveSpeedInPixelsPerTicks(6.0f);
+    // Return default speed at 6 tiles per second.
+    return Vector(6.0f, 6.0f, 0.0f);
+}
+
+Vector PlayerHandler::getPixelsPerTickMoveSpeed(const Vector &speed, Map *map)
+{
+    Vector speedInTicks;
+
+    Game *game = Game::instance();
+    if (game && !map)
+        map = game->getCurrentMap();
+
+    if (!map)
+    {
+        logger->log("Manaserv::PlayerHandler: Speed wasn't given back"
+                    " because Map not initialized.");
+        return speedInTicks;
+    }
+
+    speedInTicks.x = speed.x
+        * (float)map->getTileWidth()
+        / 1000 * (float) MILLISECONDS_IN_A_TICK;
+    speedInTicks.y = speed.y
+        * (float)map->getTileHeight()
+        / 1000 * (float) MILLISECONDS_IN_A_TICK;
+
+    return speedInTicks;
 }
 
 } // namespace ManaServ