diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
| commit | fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch) | |
| tree | 9b01df102c5f9ba032ea0f9bc413dd707e99d88b /src/resources | |
| parent | 311783bebbe2bed366dca5097697ce34c690292d (diff) | |
| parent | ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff) | |
| download | manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2 manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz manaplus-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip | |
Merge branch 'master' into invfiler
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/itemdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 71b88d192..a590dcac1 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -69,7 +69,7 @@ void ItemDB::setStatsList(const std::list<ItemDB::Stat> &stats) static ItemType itemTypeFromString(const std::string &name) { - if (name == "generic") + if (name == "generic" || name == "other") { return ITEM_UNUSABLE; } @@ -326,7 +326,7 @@ void ItemDB::load() logger->log("ItemDB: Missing " #param " attribute for item %i!", \ id) - if (id >= 0) + if (id >= 0 && typeStr != "other") { CHECK_PARAM(name, ""); CHECK_PARAM(description, ""); |