summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-26 23:40:37 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-26 23:40:37 +0200
commit2d0e84449b14615bdacb6f897791628662bbfd39 (patch)
tree08019ae6c24c6da25e25da027d04ad008c25d6a2 /src/resources
parent42605753159d7b63276351311e0fd43874a3366b (diff)
parent0056412ed33b941d72a175dcd3f025abcd8fc02b (diff)
downloadMana-2d0e84449b14615bdacb6f897791628662bbfd39.tar.gz
Mana-2d0e84449b14615bdacb6f897791628662bbfd39.tar.bz2
Mana-2d0e84449b14615bdacb6f897791628662bbfd39.tar.xz
Mana-2d0e84449b14615bdacb6f897791628662bbfd39.zip
Made the client use a unique kind of movement code.
This is fixng many issues and (hopefully) will make the movement rendering much smoother. Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge Conflicts: src/being.cpp src/net/manaserv/beinghandler.cpp Resolves: TMW-Mantis #946. Reviewed-by: Thorbjorn.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/iteminfo.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 7b9e7287..76a74111 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -160,7 +160,9 @@ class ItemInfo
* Attack action sub-types (bow, sword, ...) are defined in items.xml.
*/
std::string mAttackAction;
- int mAttackRange; /**< Attack range, will be zero if non weapon. */
+
+ /** Attack range, will be equal to ATTACK_RANGE_NOT_SET if no weapon. */
+ int mAttackRange;
// Particle to be shown when weapon attacks
std::string mMissileParticle;