diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-20 01:42:11 +0100 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-02-03 14:40:45 +0100 |
commit | 94deb596ae86bfe453c9d88e85266caae26e3980 (patch) | |
tree | afb9f3cc90a832420b28b7cb470078b100e11812 /src/localplayer.h | |
parent | 86c4819bee1bcd990b6be20f36dcb26938acac8e (diff) | |
download | mana-94deb596ae86bfe453c9d88e85266caae26e3980.tar.gz mana-94deb596ae86bfe453c9d88e85266caae26e3980.tar.bz2 mana-94deb596ae86bfe453c9d88e85266caae26e3980.tar.xz mana-94deb596ae86bfe453c9d88e85266caae26e3980.zip |
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.
Diffstat (limited to 'src/localplayer.h')
-rw-r--r-- | src/localplayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 9e2139c2..8e5795c3 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -92,7 +92,7 @@ class LocalPlayer : public Being /** * Gets the attack range. */ - int getAttackRange() + int getAttackRange() const { return mAttackRange; } void attack(Being *target = NULL, bool keep = false); @@ -147,9 +147,9 @@ class LocalPlayer : public Being void setGotoTarget(Being *target); /** - * Returns whether the target is in range to attack + * Returns whether the target is in range (in pixels). */ - bool withinAttackRange(Being *target); + bool withinRange(Actor *target, int range) const; void toggleSit(); void emote(uint8_t emotion); |