From d38328a5986f17e0e9f6183869ac446c040e4722 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Jan 2014 00:35:07 +0300 Subject: add support for patch files for items.xml, npcs.xml, monsters.xml --- src/defaults.cpp | 3 +++ src/resources/db/itemdb.cpp | 1 + src/resources/db/monsterdb.cpp | 1 + src/resources/db/npcdb.cpp | 1 + 4 files changed, 6 insertions(+) diff --git a/src/defaults.cpp b/src/defaults.cpp index ab28532fe..98195d214 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -489,10 +489,13 @@ DefaultsData* getPathsDefaults() AddDEF("charCreationFile", "charcreation.xml"); AddDEF("soundsFile", "sounds.xml"); AddDEF("itemsFile", "items.xml"); + AddDEF("itemsPatchFile", "items_patch.xml"); AddDEF("avatarsFile", "avatars.xml"); AddDEF("npcsFile", "npcs.xml"); + AddDEF("npcsPatchFile", "npcs_patch.xml"); AddDEF("petsFile", "pets.xml"); AddDEF("monstersFile", "monsters.xml"); + AddDEF("monstersPatchFile", "monsters_patch.xml"); AddDEF("mapsRemapFile", "maps/remap.xml"); AddDEF("mapsFile", "maps.xml"); AddDEF("deadMessagesFile", "deadmessages.xml"); diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index de422cd95..81feaea47 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -210,6 +210,7 @@ void ItemDB::load() mUnknown->setSprite(errFile, GENDER_OTHER, 0); mUnknown->addTag(mTags["All"]); loadXmlFile(paths.getStringValue("itemsFile"), tagNum); + loadXmlFile(paths.getStringValue("itemsPatchFile"), tagNum); } void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum) diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index d53bb4b69..f1c1a73d7 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -49,6 +49,7 @@ void MonsterDB::load() logger->log1("Initializing monster database..."); loadXmlFile(paths.getStringValue("monstersFile")); + loadXmlFile(paths.getStringValue("monstersPatchFile")); mLoaded = true; } diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index a7bc2121a..486f63952 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -48,6 +48,7 @@ void NPCDB::load() logger->log1("Initializing NPC database..."); loadXmlFile(paths.getStringValue("npcsFile")); + loadXmlFile(paths.getStringValue("npcsPatchFile")); mLoaded = true; } -- cgit v1.2.3-70-g09d2