From b04dd091b9f9e2ff366fc3a5882289df72e2efd9 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 16 Apr 2009 12:10:25 -0600 Subject: Remove last support #ifdef in the resource code --- src/resources/itemdb.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'src/resources/itemdb.cpp') diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 036bdea8..36be4d0c 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -56,6 +56,13 @@ static char const *const fields[][2] = { "mp", N_("MP %+d") } }; +static std::list extraStats; + +void ItemDB::setStatsList(std::list stats) +{ + extraStats = stats; +} + static ItemType itemTypeFromString(const std::string &name, int id = 0) { if (name=="generic") return ITEM_UNUSABLE; @@ -149,7 +156,6 @@ void ItemDB::load() itemInfo->setWeaponType(weaponType); itemInfo->setAttackRange(attackRange); -#ifdef TMWSERV_SUPPORT std::string effect; for (int i = 0; i < int(sizeof(fields) / sizeof(fields[0])); ++i) { @@ -158,12 +164,20 @@ void ItemDB::load() if (!effect.empty()) effect += " / "; effect += strprintf(gettext(fields[i][1]), value); } -#else - std::string effect = XML::getProperty(node, "effect", ""); -#endif + for (std::list::iterator it = extraStats.begin(); + it != extraStats.end(); it++) + { + int value = XML::getProperty(node, (*it)->tag.c_str(), 0); + if (!value) continue; + if (!effect.empty()) effect += " / "; + effect += strprintf((*it)->format.c_str(), value); + } + std::string temp = XML::getProperty(node, "effect", ""); + if (!effect.empty() && !temp.empty()) + effect += " / "; + effect += temp; itemInfo->setEffect(effect); - for_each_xml_child_node(itemChild, node) { if (xmlStrEqual(itemChild->name, BAD_CAST "sprite")) -- cgit v1.2.3-70-g09d2