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, 10 insertions, 0 deletions

diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 599e89b8..40e4b099 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -47,6 +47,16 @@ class GameHandler
          * Tells whether the protocol is using the MP status bar
          */
         virtual bool canUseMagicBar() const = 0;
+
+        /**
+         * Tells the range is pixel where the player can pickup items from.
+         */
+        virtual int getPickupRange() const = 0;
+
+        /**
+         * Tells the range is pixel where the player can talk to an NPC from.
+         */
+        virtual int getNpcTalkRange() const = 0;
 };
 
 } // namespace Net