From b30faa4c18fbbf804104e07c9d295bebf7d815ce Mon Sep 17 00:00:00 2001
From: Chuck Miller <shadowmil@gmail.com>
Date: Fri, 29 May 2009 19:53:14 -0400
Subject: Some movement fixes for TMWServ build.

Looked pretty good so I removed annoying debug information.
Also should note that movement between two players is still off.
---
 src/net/tmwserv/beinghandler.cpp  | 9 ++-------
 src/net/tmwserv/playerhandler.cpp | 3 ---
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/net')

diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index 1ec13800..99491203 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -191,11 +191,6 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         int dy = 0;
         int speed = 0;
 
-        printf("handleBeingsMoveMessage for %p (%s | %s)\n",
-                (void*) being,
-                (flags & MOVING_POSITION) ? "pos" : "",
-                (flags & MOVING_DESTINATION) ? "dest" : "");
-
         if (flags & MOVING_POSITION)
         {
             Uint16 sx2, sy2;
@@ -235,7 +230,7 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
 
         // If being is a player, and he only moves a little, its ok to be a little out of sync
         if (being->getType() == Being::PLAYER && abs(being->getPixelX() - dx) +
-                                                 abs(being->getPixelY() - dy) < 2 * 32 &&
+                                                 abs(being->getPixelY() - dy) < 16 &&
                                                  (dx != being->getDestination().x && dy != being->getDestination().y))
         {
             being->setDestination(being->getPixelX(),being->getPixelY());
@@ -258,7 +253,7 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         }
         else
         {
-            being->adjustCourse(sx, sy, dx, dy);
+            being->setDestination(sx, sy, dx, dy);
         }
     }
 }
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index e2b922f8..b378817f 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -373,9 +373,6 @@ void PlayerHandler::setDestination(int x, int y, int /* direction */)
     msg.writeInt16(x);
     msg.writeInt16(y);
     Net::GameServer::connection->send(msg);
-
-    // Debugging fire burst
-    effectManager->trigger(15, x, y);
 }
 
 void PlayerHandler::changeAction(Being::Action action)
-- 
cgit v1.2.3-70-g09d2