From 94deb596ae86bfe453c9d88e85266caae26e3980 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 20 Jan 2012 01:42:11 +0100 Subject: Simplified and made generic the way the pickup is handled. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I also made the range be taken from the server type as for the pickup and npc talk ranges. Last but no least, I fixed the parameters sent with PGMSG_PICKUP to send the (item) position where to pickup at as described in the manaserv protocol. The pickup is still not 100% functional due certainly to two problems: 1. The client item coordinates might not be the exact same as in the server. 2. The client seems to try to pick up the item a bit too soon, probably for the reason given in 1. I'll investigate this in another patch. Reviewed-by: Thorbjørn Lindeijer, Erik Schilling. --- src/net/tmwa/gamehandler.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/net/tmwa/gamehandler.cpp') diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index e4dc62b0..93f0b86f 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -177,4 +177,11 @@ void GameHandler::setMap(const std::string map) mMap = map.substr(0, map.rfind(".")); } +int GameHandler::getPickupRange() const +{ + if (Game *game = Game::instance()) + return game->getCurrentTileWidth(); + return DEFAULT_TILE_LENGTH; +} + } // namespace TmwAthena -- cgit v1.2.3-70-g09d2