From fac5f4d0cf2181f88629b6a21c7d433217da90ca Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 28 Feb 2017 02:06:49 +0300 Subject: Rename UseResMan into UseVirtFs. --- 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/elementaldb.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/itemfielddb.cpp | 2 +- src/resources/db/mapdb.cpp | 4 ++-- 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/npcdialogdb.cpp | 2 +- src/resources/db/petdb.cpp | 2 +- src/resources/db/questdb.cpp | 2 +- src/resources/db/skillunitdb.cpp | 2 +- src/resources/db/sounddb.cpp | 2 +- src/resources/db/statdb.cpp | 2 +- src/resources/db/statuseffectdb.cpp | 2 +- src/resources/db/unitsdb.cpp | 2 +- src/resources/loaders/xmlloader.cpp | 4 ++-- src/resources/loaders/xmlloader.h | 2 +- src/resources/mapreader.cpp | 6 +++--- src/resources/sprite/spritedef.cpp | 4 ++-- 28 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/resources') diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index b14f8fff6..8af32cd6c 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -55,7 +55,7 @@ void AvatarDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/chardb.cpp b/src/resources/db/chardb.cpp index 96372dfc8..eb96538c5 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"), - UseResman_true, + UseVirtFs_true, SkipError_false); const XmlNodePtrConst root = doc->rootNode(); diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 90e1436ac..9261e8a76 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -79,7 +79,7 @@ void ColorDB::loadHair(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); @@ -125,7 +125,7 @@ void ColorDB::loadColorLists(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); if (!root) diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp index 422fdbeda..2338287c2 100644 --- a/src/resources/db/commandsdb.cpp +++ b/src/resources/db/commandsdb.cpp @@ -61,7 +61,7 @@ static CommandTargetT parseTarget(const std::string &text) void CommandsDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); 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 2d9293e0f..eddc4ff42 100644 --- a/src/resources/db/deaddb.cpp +++ b/src/resources/db/deaddb.cpp @@ -50,7 +50,7 @@ void DeadDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); diff --git a/src/resources/db/elementaldb.cpp b/src/resources/db/elementaldb.cpp index 90b1e5943..21788b08e 100644 --- a/src/resources/db/elementaldb.cpp +++ b/src/resources/db/elementaldb.cpp @@ -54,7 +54,7 @@ void ElementalDb::load() void ElementalDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "elementals")) diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index f8522be86..8fddc0a19 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -72,7 +72,7 @@ void EmoteDB::load() void EmoteDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "emotes")) @@ -149,7 +149,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName, void EmoteDB::loadSpecialXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "emotes")) diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index 342824e30..77c1b4323 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -55,7 +55,7 @@ void HomunculusDB::load() void HomunculusDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); 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 44c4d02bf..1eab6ada7 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -149,7 +149,7 @@ void HorseDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 06ce15542..e347528eb 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -241,7 +241,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, } XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/itemfielddb.cpp b/src/resources/db/itemfielddb.cpp index 0eeb7f901..6ba76db2c 100644 --- a/src/resources/db/itemfielddb.cpp +++ b/src/resources/db/itemfielddb.cpp @@ -103,7 +103,7 @@ void ItemFieldDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp index cbac91e9d..b9c6818b3 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -63,7 +63,7 @@ void MapDB::loadRemapXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document *const doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); @@ -151,7 +151,7 @@ void MapDB::loadInfo(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); if (!root) diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 90c547208..0e2fdcae0 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -56,7 +56,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtr rootNode = doc.rootNode(); diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp index c79b37800..4e67cb612 100644 --- a/src/resources/db/moddb.cpp +++ b/src/resources/db/moddb.cpp @@ -51,7 +51,7 @@ void ModDB::load() void ModDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); 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 2cb5a6a0e..2c87f19f8 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, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); 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 4e5fd35fe..9c77950b7 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -60,7 +60,7 @@ void NPCDB::load() void NPCDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "npcs")) diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp index fcd4504c0..6ab48e4bd 100644 --- a/src/resources/db/npcdialogdb.cpp +++ b/src/resources/db/npcdialogdb.cpp @@ -151,7 +151,7 @@ void NpcDialogDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document *const doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index 1a6e6e5cd..d3d166675 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -57,7 +57,7 @@ void PETDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp index 89228f038..c28c9c278 100644 --- a/src/resources/db/questdb.cpp +++ b/src/resources/db/questdb.cpp @@ -178,7 +178,7 @@ void QuestDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc.rootNode(); if (!root) diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp index b0a465ec4..8beae1ac2 100644 --- a/src/resources/db/skillunitdb.cpp +++ b/src/resources/db/skillunitdb.cpp @@ -56,7 +56,7 @@ void SkillUnitDb::load() void SkillUnitDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "skillunits")) diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp index ace3924bc..a62045505 100644 --- a/src/resources/db/sounddb.cpp +++ b/src/resources/db/sounddb.cpp @@ -47,7 +47,7 @@ void SoundDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst root = doc->rootNode(); diff --git a/src/resources/db/statdb.cpp b/src/resources/db/statdb.cpp index d4424b6e2..e2d4292a1 100644 --- a/src/resources/db/statdb.cpp +++ b/src/resources/db/statdb.cpp @@ -171,7 +171,7 @@ void StatDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { XML::Document doc(fileName, - UseResman_true, + UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp index a535da534..fea06230e 100644 --- a/src/resources/db/statuseffectdb.cpp +++ b/src/resources/db/statuseffectdb.cpp @@ -87,7 +87,7 @@ void StatusEffectDB::load() void StatusEffectDB::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "status-effects")) diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp index 37c516390..0c06f6a4c 100644 --- a/src/resources/db/unitsdb.cpp +++ b/src/resources/db/unitsdb.cpp @@ -190,7 +190,7 @@ static void loadCurrencies(XmlNodePtr parentNode) void UnitsDb::loadXmlFile(const std::string &fileName, const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, skipError); + XML::Document doc(fileName, UseVirtFs_true, skipError); const XmlNodePtrConst root = doc.rootNode(); if (!root || !xmlNameEqual(root, "units")) diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp index 647b45664..ac005bc06 100644 --- a/src/resources/loaders/xmlloader.cpp +++ b/src/resources/loaders/xmlloader.cpp @@ -35,7 +35,7 @@ namespace A_DEFAULT_COPY(ResourceLoader) const std::string path; - const UseResman useResman; + const UseVirtFs useResman; const SkipError skipError; static Resource *load(const void *const v) @@ -54,7 +54,7 @@ namespace } // namespace XML::Document *Loader::getXml(const std::string &idPath, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError) { ResourceLoader rl = { idPath, useResman, skipError }; diff --git a/src/resources/loaders/xmlloader.h b/src/resources/loaders/xmlloader.h index d222f1c17..a52186daa 100644 --- a/src/resources/loaders/xmlloader.h +++ b/src/resources/loaders/xmlloader.h @@ -30,7 +30,7 @@ namespace Loader { XML::Document *getXml(const std::string &idPath, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError) A_WARN_UNUSED; } // namespace Loader diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index bf0b95f71..59ddaddb7 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -226,7 +226,7 @@ void MapReader::addLayerToList(const std::string &fileName, const SkipError skipError) { XML::Document *doc = new XML::Document(fileName, - UseResman_true, + UseVirtFs_true, skipError); XmlNodePtrConst node = doc->rootNode(); if (!node) @@ -259,7 +259,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, UseResman_true, SkipError_false); + XML::Document doc(realFilename, UseVirtFs_true, SkipError_false); if (!doc.isLoaded()) { BLOCK_END("MapReader::readMap str") @@ -1070,7 +1070,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, std::string filename = XML::getProperty(node, "source", ""); filename = resolveRelativePath(path, filename); - doc = new XML::Document(filename, UseResman_true, SkipError_false); + doc = new XML::Document(filename, UseVirtFs_true, SkipError_false); node = doc->rootNode(); if (!node) { diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index b5af1f057..544729d6a 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -95,7 +95,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, palettes = animationFile.substr(pos + 1); XML::Document *const doc = Loader::getXml(animationFile.substr(0, pos), - UseResman_true, + UseVirtFs_true, SkipError_false); if (!doc) return nullptr; @@ -489,7 +489,7 @@ void SpriteDef::includeSprite(const XmlNodePtr includeNode, const int variant) mProcessedFiles.insert(filename); XML::Document *const doc = Loader::getXml(filename, - UseResman_true, + UseVirtFs_true, SkipError_false); if (!doc) return; -- cgit v1.2.3-60-g2f50