diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
commit | 2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a (patch) | |
tree | 49fb5a1e363584800f967a4a163fb3e746228722 /src/resources/itemdb.cpp | |
parent | bbf4d657e77fd39887b9941af1fe75a5ec27d988 (diff) | |
download | Mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.gz Mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.bz2 Mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.xz Mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.zip |
Merge item types to remove more #ifdefs
Diffstat (limited to 'src/resources/itemdb.cpp')
-rw-r--r-- | src/resources/itemdb.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index db919b64..d9994892 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -147,12 +147,8 @@ void ItemDB::load() itemInfo->setImageName(image); itemInfo->setName(name.empty() ? _("Unnamed") : name); itemInfo->setDescription(description); -#ifdef TMWSERV_SUPPORT int type = itemTypeFromString(typeStr); itemInfo->setType(type); -#else - itemInfo->setType(typeStr); -#endif itemInfo->setView(view); itemInfo->setWeight(weight); itemInfo->setWeaponType(weaponType); |