diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/manaserv/beinghandler.cpp | 16 | ||||
| -rw-r--r-- | src/net/manaserv/playerhandler.cpp | 6 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index 2db76255..09608891 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -202,10 +202,18 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg) } if (speed) { - // The being's speed is transfered in tiles per second * 10 - // to keep it transferable in a Byte. - // We set it back to tiles per second and in a float. - being->setWalkSpeed((float) speed / 10); + /** + * The being's speed is transfered in tiles per second * 10 + * to keep it transferable in a Byte. + * We set it back to tiles per second and in a float. + * Then, we translate it in pixels per ticks, to correspond + * with the Being::logic() function calls + * @see MILLISECONDS_IN_A_TICK + */ + const float walkSpeedInTicks = + ((float)DEFAULT_TILE_SIDE_LENGTH * (float) speed / 10) + / 1000 * (float)MILLISECONDS_IN_A_TICK; + being->setWalkSpeed(walkSpeedInTicks); } // Ignore messages from the server for the local player diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 0d7544fd..aac6dc22 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -49,6 +49,8 @@ extern BuyDialog *buyDialog; extern SellDialog *sellDialog; extern Window *buySellDialog; +extern const int MILLISECONDS_IN_A_TICK; + /* Max. distance we are willing to scroll after a teleport; * everything beyond will reset the port hard. */ @@ -425,7 +427,9 @@ int PlayerHandler::getJobLocation() float PlayerHandler::getDefaultWalkSpeed() { - return 6.0f; + // Return translation in pixels per ticks. + return (6.0f * (float)DEFAULT_TILE_SIDE_LENGTH) + / 1000 * (float)MILLISECONDS_IN_A_TICK; } } // namespace ManaServ |