diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-07 17:51:56 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-07 17:51:56 +0300 |
commit | bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2 (patch) | |
tree | 34749cc1679dc9a4d81652e77ed8aaf775f89882 /src/resources/db | |
parent | 328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b (diff) | |
download | manaverse-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.gz manaverse-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.bz2 manaverse-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.xz manaverse-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.zip |
Dont show some useless errors while loading themes.
Diffstat (limited to 'src/resources/db')
-rw-r--r-- | src/resources/db/avatardb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/chardb.cpp | 3 | ||||
-rw-r--r-- | src/resources/db/colordb.cpp | 4 | ||||
-rw-r--r-- | src/resources/db/commandsdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/deaddb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/emotedb.cpp | 4 | ||||
-rw-r--r-- | src/resources/db/homunculusdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/itemdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/mapdb.cpp | 4 | ||||
-rw-r--r-- | src/resources/db/mercenarydb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/moddb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/monsterdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/npcdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/petdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/sounddb.cpp | 2 |
15 files changed, 19 insertions, 18 deletions
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index c01eff88b..52242b4fe 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -52,7 +52,7 @@ void AvatarDB::load() void AvatarDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "avatars")) diff --git a/src/resources/db/chardb.cpp b/src/resources/db/chardb.cpp index 15810596b..b05beb75c 100644 --- a/src/resources/db/chardb.cpp +++ b/src/resources/db/chardb.cpp @@ -50,7 +50,8 @@ void CharDB::load() XML::Document *doc = new XML::Document( paths.getStringValue("charCreationFile"), - true); + true, + false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "chars")) diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index ff4833f2c..77024d290 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -72,7 +72,7 @@ void ColorDB::load() void ColorDB::loadHair(const std::string &fileName, std::map<int, ItemColor> &colors) { - XML::Document *doc = new XML::Document(fileName, true); + XML::Document *doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "colors")) @@ -110,7 +110,7 @@ void ColorDB::loadHair(const std::string &fileName, void ColorDB::loadColorLists(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true); + XML::Document *doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root) { diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp index f1c177916..daab8ef2e 100644 --- a/src/resources/db/commandsdb.cpp +++ b/src/resources/db/commandsdb.cpp @@ -58,7 +58,7 @@ static SpellTarget parseTarget(const std::string &text) void CommandsDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "commands")) diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp index 45bc77478..fcb44e63f 100644 --- a/src/resources/db/deaddb.cpp +++ b/src/resources/db/deaddb.cpp @@ -48,7 +48,7 @@ void DeadDB::load() void DeadDB::loadXmlFile(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true); + XML::Document *doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "messages")) diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index f527a9624..7da44c0da 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -67,7 +67,7 @@ void EmoteDB::load() void EmoteDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "emotes")) @@ -143,7 +143,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName) void EmoteDB::loadSpecialXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "emotes")) diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index e5337f8c3..75194c4c7 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -56,7 +56,7 @@ void HomunculusDB::load() void HomunculusDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "homunculuses")) diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index ba072f62a..189288bf1 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -234,7 +234,7 @@ void ItemDB::load() void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "items")) diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp index 1a419bf9d..73a4a9905 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -59,7 +59,7 @@ void MapDB::load() void MapDB::loadRemapXmlFile(const std::string &fileName) { - XML::Document *const doc = new XML::Document(fileName, true); + XML::Document *const doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root) @@ -140,7 +140,7 @@ void MapDB::readAtlas(XmlNodePtrConst node) void MapDB::loadInfo(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true); + XML::Document *doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root) { diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 5ce60f131..c63e8acd2 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -56,7 +56,7 @@ void MercenaryDB::load() void MercenaryDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "mercenaries")) diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp index 81fc1e428..5c4ffe0f6 100644 --- a/src/resources/db/moddb.cpp +++ b/src/resources/db/moddb.cpp @@ -50,7 +50,7 @@ void ModDB::load() void ModDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "mods")) diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 7d6fe30b2..3e4c78e63 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -59,7 +59,7 @@ void MonsterDB::load() void MonsterDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "monsters")) diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index 079bbe4c8..6ba5fd0da 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -56,7 +56,7 @@ void NPCDB::load() void NPCDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "npcs")) diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index c89725a17..1f7fee0b7 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -54,7 +54,7 @@ void PETDB::load() void PETDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true); + XML::Document doc(fileName, true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "pets")) diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp index c6e5bcb8a..ce61bf6d4 100644 --- a/src/resources/db/sounddb.cpp +++ b/src/resources/db/sounddb.cpp @@ -44,7 +44,7 @@ void SoundDB::load() void SoundDB::loadXmlFile(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true); + XML::Document *doc = new XML::Document(fileName, true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "sounds")) |