summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 15:19:50 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 15:19:50 +0000
commit35d2fefb789751b8730c6f0fae674e72673228d0 (patch)
tree185c267faed52cd416cdefa16d1e160d2b0d3c02 /src/resources/iteminfo.h
parentca58ec1faedca0081ecd233f2cefa1ba783cebf4 (diff)
downloadmana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.gz
mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.bz2
mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.xz
mana-35d2fefb789751b8730c6f0fae674e72673228d0.zip
Merged revisions 3692 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line Made it compile with GCC 4.3 ........
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r--src/resources/iteminfo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index b6fc922c..2726a012 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -107,7 +107,7 @@ class ItemInfo
void setWeaponType(int);
- const SpriteAction getAttackType() const
+ SpriteAction getAttackType() const
{ return mAttackType; }
void addSound(EquipmentSoundEvent event, const std::string &filename);