summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-05 21:18:01 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-05 21:18:01 +0200
commit2c0421a336789347664078383fad45c29b0a9d10 (patch)
tree881feca9aab6705fdc76fd36634fa02fb007d9b9 /src
parent827f91446c550fdf066cb9bec1d6b15ae8662b78 (diff)
downloadmanaplus-2c0421a336789347664078383fad45c29b0a9d10.tar.gz
manaplus-2c0421a336789347664078383fad45c29b0a9d10.tar.bz2
manaplus-2c0421a336789347664078383fad45c29b0a9d10.tar.xz
manaplus-2c0421a336789347664078383fad45c29b0a9d10.zip
Fix log errors about missing xml attributes.
Diffstat (limited to 'src')
-rw-r--r--src/resources/itemdb.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index cc70e33b7..33978192f 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -67,7 +67,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;
}
@@ -298,7 +298,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, "");