diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-02 22:25:24 +0200 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-02 22:28:24 +0200 |
commit | 4a8080dcf73dab2b6e62b8500fec3bb996bcbf17 (patch) | |
tree | 67ef51dbb1b360f9a3e7c38cf0dbeb2b5f001bfd /src/game-server/commandhandler.cpp | |
parent | ad3958701136ff8ae4a4fc749ef616cc8917d2af (diff) | |
download | manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.gz manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.bz2 manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.tar.xz manaserv-4a8080dcf73dab2b6e62b8500fec3bb996bcbf17.zip |
Fixed multiple warnings and errors that blocked c++0x
This allows the server to compile with c++0x (and enables it).
This also includes some coding style / readabillity fixes.
Diffstat (limited to 'src/game-server/commandhandler.cpp')
-rw-r--r-- | src/game-server/commandhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 353c3ef0..68899e3c 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -377,7 +377,7 @@ static void handleWarp(Character *player, std::string &args) y = utils::stringToInt(ystr); // now warp the player - GameState::warp(player, map, x, y); + GameState::warp(player, map, Point(x, y)); // log transaction std::stringstream ss; @@ -479,7 +479,7 @@ static void handleCharWarp(Character *player, std::string &args) y = utils::stringToInt(ystr); // now warp the player - GameState::warp(other, map, x, y); + GameState::warp(other, map, Point(x, y)); // log transaction std::stringstream ss; @@ -774,7 +774,7 @@ static void handleGoto(Character *player, std::string &args) // move the player to where the other player is MapComposite *map = other->getMap(); const Point &pos = other->getPosition(); - GameState::warp(player, map, pos.x, pos.y); + GameState::warp(player, map, pos); // log transaction std::stringstream msg; @@ -808,7 +808,7 @@ static void handleRecall(Character *player, std::string &args) // move the other player to where the player is MapComposite *map = player->getMap(); const Point &pos = player->getPosition(); - GameState::warp(other, map, pos.x, pos.y); + GameState::warp(other, map, pos); } static void handleReload(Character *, std::string &) |