diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 00:01:39 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-26 17:42:56 -0600 |
| commit | 22974109dd0e9ae2b915cc2c258df1f01a65b729 (patch) | |
| tree | 043245026b4c52582638ebe8039341fd2c50af74 | |
| parent | d26a7795fa90c6e26f5302db4a470321bce4a5cb (diff) | |
| download | mana-22974109dd0e9ae2b915cc2c258df1f01a65b729.tar.gz mana-22974109dd0e9ae2b915cc2c258df1f01a65b729.tar.bz2 mana-22974109dd0e9ae2b915cc2c258df1f01a65b729.tar.xz mana-22974109dd0e9ae2b915cc2c258df1f01a65b729.zip | |
Fixed duplicate check for item names
| -rw-r--r-- | src/being.cpp | 2 | ||||
| -rw-r--r-- | src/resources/itemdb.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/being.cpp b/src/being.cpp index 61826089..8f00fd3c 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -203,7 +203,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) color = &guiPalette->getColor(Palette::HIT_CRITICAL); } else if (!amount) - { + { if (attacker == player_node) { // This is intended to be the wrong direction to visually diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 2b94bd61..49913300 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -125,12 +125,12 @@ void ItemDB::load() mItemInfos[id] = itemInfo; if (!name.empty()) { - NamedItemInfoIterator itr = mNamedItemInfos.find(name); + std::string temp = name; + toLower(trim(temp)); + + NamedItemInfoIterator itr = mNamedItemInfos.find(temp); if (itr == mNamedItemInfos.end()) { - std::string temp = name; - toLower(trim(temp)); - mNamedItemInfos[temp] = itemInfo; } else |