summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-26 14:32:56 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-26 14:32:56 +0300
commit61e3fa8513c1bc2644348ac6052ab87785fb119d (patch)
tree9c889be66d242ac12c382708323e463be9862eef /src
parent41f0e3289d9827ef71b6b76f524b530ff6f3de67 (diff)
downloadmv-61e3fa8513c1bc2644348ac6052ab87785fb119d.tar.gz
mv-61e3fa8513c1bc2644348ac6052ab87785fb119d.tar.bz2
mv-61e3fa8513c1bc2644348ac6052ab87785fb119d.tar.xz
mv-61e3fa8513c1bc2644348ac6052ab87785fb119d.zip
Add support for include tag in items.xml.
Example: <include name="items2.xml"/>
Diffstat (limited to 'src')
-rw-r--r--src/resources/itemdb.cpp13
-rw-r--r--src/resources/itemdb.h8
2 files changed, 14 insertions, 7 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index b4ae544ba..4643b5d76 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -176,8 +176,12 @@ void ItemDB::load()
mUnknown->setSprite(errFile, GENDER_FEMALE, 0);
mUnknown->setSprite(errFile, GENDER_OTHER, 0);
mUnknown->addTag(mTags["All"]);
+ loadXmlFile("items.xml", tagNum);
+}
- XML::Document doc("items.xml");
+void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
+{
+ XML::Document doc(fileName);
const XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "items"))
@@ -189,6 +193,13 @@ void ItemDB::load()
for_each_xml_child_node(node, rootNode)
{
+ if (xmlNameEqual(node, "include"))
+ {
+ const std::string name = XML::getProperty(node, "name", "");
+ if (!name.empty())
+ loadXmlFile(name, tagNum);
+ continue;
+ }
if (!xmlNameEqual(node, "item"))
continue;
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 98b38d256..44ab68f6d 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -37,16 +37,12 @@ class ItemInfo;
*/
namespace ItemDB
{
- /**
- * Loads the item data from <code>items.xml</code>.
- */
void load();
- /**
- * Frees item data.
- */
void unload();
+ void loadXmlFile(const std::string &fileName, int &tagNum);
+
const StringVect &getTags();
bool exists(const int id) A_WARN_UNUSED;