From 6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 May 2015 23:13:00 +0300 Subject: Add strong types bool type UseResman. --- src/resources/db/avatardb.cpp | 2 +- src/resources/db/chardb.cpp | 2 +- src/resources/db/colordb.cpp | 4 ++-- src/resources/db/commandsdb.cpp | 2 +- src/resources/db/deaddb.cpp | 2 +- src/resources/db/emotedb.cpp | 4 ++-- src/resources/db/homunculusdb.cpp | 2 +- src/resources/db/horsedb.cpp | 2 +- src/resources/db/itemdb.cpp | 2 +- src/resources/db/mapdb.cpp | 8 ++++++-- src/resources/db/mercenarydb.cpp | 2 +- src/resources/db/moddb.cpp | 2 +- src/resources/db/monsterdb.cpp | 2 +- src/resources/db/npcdb.cpp | 2 +- src/resources/db/petdb.cpp | 2 +- src/resources/db/sounddb.cpp | 2 +- src/resources/mapreader.cpp | 6 +++--- src/resources/spritedef.cpp | 4 ++-- 18 files changed, 28 insertions(+), 24 deletions(-) (limited to 'src/resources') diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index 52242b4fe..ab8e7d2c9 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, false); + XML::Document doc(fileName, UseResman_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 b05beb75c..6f304cf65 100644 --- a/src/resources/db/chardb.cpp +++ b/src/resources/db/chardb.cpp @@ -50,7 +50,7 @@ void CharDB::load() XML::Document *doc = new XML::Document( paths.getStringValue("charCreationFile"), - true, + UseResman_true, false); const XmlNodePtrConst root = doc->rootNode(); diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index bf8c06986..d1ac10e3f 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -70,7 +70,7 @@ void ColorDB::load() void ColorDB::loadHair(const std::string &fileName, std::map &colors) { - XML::Document *doc = new XML::Document(fileName, true, false); + XML::Document *doc = new XML::Document(fileName, UseResman_true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "colors")) @@ -108,7 +108,7 @@ void ColorDB::loadHair(const std::string &fileName, void ColorDB::loadColorLists(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true, false); + XML::Document *doc = new XML::Document(fileName, UseResman_true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root) { diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp index daab8ef2e..be7666f32 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, false); + XML::Document doc(fileName, UseResman_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 fcb44e63f..a3465dabd 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, false); + XML::Document *doc = new XML::Document(fileName, UseResman_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 7da44c0da..37c0bacc7 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, false); + XML::Document doc(fileName, UseResman_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, false); + XML::Document doc(fileName, UseResman_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 75194c4c7..b954ea9ab 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, false); + XML::Document doc(fileName, UseResman_true, false); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "homunculuses")) diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index c6d364b27..df653ecfe 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -58,7 +58,7 @@ void HorseDB::load() void HorseDB::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName, true, false); + XML::Document doc(fileName, UseResman_true, false); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "horses")) diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 11b6f47f4..cf78a0a06 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, false); + XML::Document doc(fileName, UseResman_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 73a4a9905..a40a7b2ae 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -59,7 +59,9 @@ void MapDB::load() void MapDB::loadRemapXmlFile(const std::string &fileName) { - XML::Document *const doc = new XML::Document(fileName, true, false); + XML::Document *const doc = new XML::Document(fileName, + UseResman_true, + false); const XmlNodePtrConst root = doc->rootNode(); if (!root) @@ -140,7 +142,9 @@ void MapDB::readAtlas(XmlNodePtrConst node) void MapDB::loadInfo(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true, false); + XML::Document *doc = new XML::Document(fileName, + UseResman_true, + false); const XmlNodePtrConst root = doc->rootNode(); if (!root) { diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index c63e8acd2..f8ecd9839 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, false); + XML::Document doc(fileName, UseResman_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 5c4ffe0f6..82cd14be8 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, false); + XML::Document doc(fileName, UseResman_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 3e4c78e63..0c546ff25 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, false); + XML::Document doc(fileName, UseResman_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 6ba5fd0da..101f95f1a 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, false); + XML::Document doc(fileName, UseResman_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 1f7fee0b7..47723b92d 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, false); + XML::Document doc(fileName, UseResman_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 ce61bf6d4..8e1d22bc0 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, false); + XML::Document *doc = new XML::Document(fileName, UseResman_true, false); const XmlNodePtrConst root = doc->rootNode(); if (!root || !xmlNameEqual(root, "sounds")) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 49e3ced2d..474e339ec 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -204,7 +204,7 @@ int inflateMemory(unsigned char *restrict const in, void MapReader::addLayerToList(const std::string &fileName) { - XML::Document *doc = new XML::Document(fileName, true, false); + XML::Document *doc = new XML::Document(fileName, UseResman_true, false); XmlNodePtrConst node = doc->rootNode(); if (!node) { @@ -236,7 +236,7 @@ Map *MapReader::readMap(const std::string &restrict filename, BLOCK_START("MapReader::readMap str") logger->log("Attempting to read map %s", realFilename.c_str()); - XML::Document doc(realFilename, true, false); + XML::Document doc(realFilename, UseResman_true, false); if (!doc.isLoaded()) { BLOCK_END("MapReader::readMap str") @@ -894,7 +894,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, std::string filename = XML::getProperty(node, "source", ""); filename = resolveRelativePath(path, filename); - doc = new XML::Document(filename, true, false); + doc = new XML::Document(filename, UseResman_true, false); node = doc->rootNode(); if (!node) { diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 1f5b02610..d22cc7899 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -87,7 +87,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, if (pos != std::string::npos) palettes = animationFile.substr(pos + 1); - XML::Document doc(animationFile.substr(0, pos), true, false); + XML::Document doc(animationFile.substr(0, pos), UseResman_true, false); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "sprite")) @@ -434,7 +434,7 @@ void SpriteDef::includeSprite(const XmlNodePtr includeNode, const int variant) } mProcessedFiles.insert(filename); - XML::Document doc(filename, true, false); + XML::Document doc(filename, UseResman_true, false); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "sprite")) -- cgit v1.2.3-60-g2f50