summaryrefslogtreecommitdiff
path: root/src/net/tmwa/playerhandler.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-28 20:37:05 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-03-28 20:37:05 +0200
commite7e550c863c3bb5d5e8697ecce1ea37ad248e362 (patch)
tree3928fa5a167a0bd3975a6c889775bc4ddea195a2 /src/net/tmwa/playerhandler.cpp
parent25bfbc30fb4958a3a754d74bbe971dec717f831c (diff)
downloadmana-e7e550c863c3bb5d5e8697ecce1ea37ad248e362.tar.gz
mana-e7e550c863c3bb5d5e8697ecce1ea37ad248e362.tar.bz2
mana-e7e550c863c3bb5d5e8697ecce1ea37ad248e362.tar.xz
mana-e7e550c863c3bb5d5e8697ecce1ea37ad248e362.zip
Random code cleanups requested righteously by Thorbjorn - part 1.
- Fixed bogus documentation. - Fixed Vector parameters to const Vector& where releavant. - Removed a false comment. - Removed superfluous headers in src/net/tmwa/beinghandler.h. - Optimize a bit the tmwa::beingHandler::getPixelsPerTickMoveSpeed() function.
Diffstat (limited to 'src/net/tmwa/playerhandler.cpp')
-rw-r--r--src/net/tmwa/playerhandler.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 9210de6e..9d97dc73 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -615,7 +615,7 @@ int PlayerHandler::getJobLocation()
return JOB;
}
-Vector PlayerHandler::getDefaultMoveSpeed()
+Vector PlayerHandler::getDefaultMoveSpeed() const
{
// Return an normalized speed for any side
// as the offset is calculated elsewhere.
@@ -623,30 +623,23 @@ Vector PlayerHandler::getDefaultMoveSpeed()
return Vector(15.0f, 15.0f, 0.0f);
}
-Vector PlayerHandler::getPixelsPerTickMoveSpeed(Vector speed, Map *map)
+Vector PlayerHandler::getPixelsPerTickMoveSpeed(const Vector &speed, Map *map)
{
Game *game = Game::instance();
if (game && !map)
map = game->getCurrentMap();
- if (!map)
+ if (!map || speed.x == 0 || speed.y == 0)
{
- logger->log("TmwAthena::PlayerHandler: Speed not given back"
- " because Map not yet initialized.");
- return Vector(0.0f, 0.0f, 0.0f);
- }
-
- if (speed.x == 0 || speed.y == 0)
- {
- logger->log("TmwAthena::PlayerHandler: "
- "Invalid Speed given from server.");
- speed = getDefaultMoveSpeed();
+ logger->log("TmwAthena::PlayerHandler: Speed set to default: "
+ "Map not yet initialized or invalid speed.");
+ return getDefaultMoveSpeed();
}
Vector speedInTicks;
- speedInTicks.z = 0; // We don't use z for now.
+ // speedInTicks.z = 0; // We don't use z for now.
speedInTicks.x = 1 / speed.x * (float)map->getTileWidth();
speedInTicks.y = 1 / speed.y * (float)map->getTileHeight();