diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-06-12 09:06:01 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-06-12 09:06:01 +0000 |
| commit | 2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258 (patch) | |
| tree | 8d256ac1a38932aaf0db7b55ed178e4212616555 /src/equipment.cpp | |
| parent | eb019ab915998a3ec247b33dad4b23f763d7a29a (diff) | |
| download | mana-2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258.tar.gz mana-2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258.tar.bz2 mana-2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258.tar.xz mana-2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258.zip | |
Merged revisions 3738 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines
Moved item icon from ItemInfo class to the Item class, so that it can be loaded
on demand. Results in faster startup time and reduced memory usage.
........
Diffstat (limited to 'src/equipment.cpp')
| -rw-r--r-- | src/equipment.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/equipment.cpp b/src/equipment.cpp index 6cd4d967..d1f9a6cf 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -26,18 +26,19 @@ #include <algorithm> #include "item.h" +#include "item.h" Equipment::Equipment(): mArrows(0) { - std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*)0); + std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0); } void Equipment::removeEquipment(Item *item) { - Item **i = std::find(mEquipment, mEquipment+EQUIPMENT_SIZE, item); - if (i != mEquipment+EQUIPMENT_SIZE) { + Item **i = std::find(mEquipment, mEquipment + EQUIPMENT_SIZE, item); + if (i != mEquipment + EQUIPMENT_SIZE) { *i = 0; } } |