From 86ee4c6435ec085abdef4cbbadcc86881e5fc48b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 30 Aug 2007 20:28:28 +0000 Subject: Reverted equipment database and included original low-ID items in items.xml for compatibility with eAthena, which doesn't support View ID to come above 255. --- ChangeLog | 4 ++++ src/resources/itemdb.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48bf32e8..dfd9eba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,10 @@ fallback item icon and use it for unknown items or when item image fails to load. * NEWS: Updated with changes since last update. + * data/items.xml, data/equipment.xml: Reverted equipment database and + included original low-ID items in items.xml for compatibility with + eAthena, which doesn't support View ID to come above 255. + * src/resources/itemdb.cpp: Accept items without a name. 2007-08-29 Bjørn Lindeijer diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index cfc485cb..18952ae9 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -109,11 +109,11 @@ void ItemDB::load() std::string effect = XML::getProperty(node, "effect", ""); std::string attackType = XML::getProperty(node, "attacktype", ""); - if (id && name != "") + if (id) { ItemInfo *itemInfo = new ItemInfo(); itemInfo->setImage(image); - itemInfo->setName(name); + itemInfo->setName((name == "") ? "Unnamed" : name); itemInfo->setDescription(description); itemInfo->setEffect(effect); itemInfo->setType(type); -- cgit v1.2.3-70-g09d2