Simplified and made generic the way the pickup is handled.

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.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index b8dda036..2d33710e 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -27,6 +27,8 @@
 
 #include "net/manaserv/messagehandler.h"
 
+#include "net/manaserv/manaserv_protocol.h"
+
 namespace ManaServ {
 
 class GameHandler : public MessageHandler, public Net::GameHandler
@@ -56,6 +58,10 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         /** The ManaServ protocol doesn't use the MP status bar. */
         bool canUseMagicBar() const { return false; }
+
+        int getPickupRange() const { return PICKUP_RANGE; }
+
+        int getNpcTalkRange() const { return NPC_TALK_RANGE; }
 };
 
 } // namespace ManaServ