summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/avatardb.cpp2
-rw-r--r--src/resources/db/chardb.cpp2
-rw-r--r--src/resources/db/colordb.cpp8
-rw-r--r--src/resources/db/commandsdb.cpp2
-rw-r--r--src/resources/db/deaddb.cpp4
-rw-r--r--src/resources/db/emotedb.cpp4
-rw-r--r--src/resources/db/homunculusdb.cpp2
-rw-r--r--src/resources/db/horsedb.cpp2
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/db/mapdb.cpp4
-rw-r--r--src/resources/db/mercenarydb.cpp2
-rw-r--r--src/resources/db/moddb.cpp2
-rw-r--r--src/resources/db/monsterdb.cpp2
-rw-r--r--src/resources/db/npcdb.cpp2
-rw-r--r--src/resources/db/petdb.cpp2
-rw-r--r--src/resources/db/sounddb.cpp4
-rw-r--r--src/resources/mapreader.cpp8
-rw-r--r--src/resources/spritedef.cpp6
18 files changed, 36 insertions, 24 deletions
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp
index ab8e7d2c9..7e58db364 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 6f304cf65..9b6f24358 100644
--- a/src/resources/db/chardb.cpp
+++ b/src/resources/db/chardb.cpp
@@ -51,7 +51,7 @@ void CharDB::load()
XML::Document *doc = new XML::Document(
paths.getStringValue("charCreationFile"),
UseResman_true,
- false);
+ SkipError_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 d1ac10e3f..1b636e407 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -70,7 +70,9 @@ void ColorDB::load()
void ColorDB::loadHair(const std::string &fileName,
std::map<int, ItemColor> &colors)
{
- XML::Document *doc = new XML::Document(fileName, UseResman_true, false);
+ XML::Document *doc = new XML::Document(fileName,
+ UseResman_true,
+ SkipError_false);
const XmlNodePtrConst root = doc->rootNode();
if (!root || !xmlNameEqual(root, "colors"))
@@ -108,7 +110,9 @@ void ColorDB::loadHair(const std::string &fileName,
void ColorDB::loadColorLists(const std::string &fileName)
{
- XML::Document *doc = new XML::Document(fileName, UseResman_true, false);
+ XML::Document *doc = new XML::Document(fileName,
+ UseResman_true,
+ SkipError_false);
const XmlNodePtrConst root = doc->rootNode();
if (!root)
{
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp
index be7666f32..091ae718c 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 a3465dabd..24d62a796 100644
--- a/src/resources/db/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -48,7 +48,9 @@ void DeadDB::load()
void DeadDB::loadXmlFile(const std::string &fileName)
{
- XML::Document *doc = new XML::Document(fileName, UseResman_true, false);
+ XML::Document *doc = new XML::Document(fileName,
+ UseResman_true,
+ SkipError_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 37c0bacc7..accea5ae9 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 b954ea9ab..173b37e65 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 df653ecfe..11fd57d36 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 cf78a0a06..d1ec2d00f 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 a40a7b2ae..1bd63af2f 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -61,7 +61,7 @@ void MapDB::loadRemapXmlFile(const std::string &fileName)
{
XML::Document *const doc = new XML::Document(fileName,
UseResman_true,
- false);
+ SkipError_false);
const XmlNodePtrConst root = doc->rootNode();
if (!root)
@@ -144,7 +144,7 @@ void MapDB::loadInfo(const std::string &fileName)
{
XML::Document *doc = new XML::Document(fileName,
UseResman_true,
- false);
+ SkipError_false);
const XmlNodePtrConst root = doc->rootNode();
if (!root)
{
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index f8ecd9839..a101bc891 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 82cd14be8..49e9b48f5 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 0c546ff25..cfb7f4e92 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 101f95f1a..bb006e75a 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 47723b92d..31893403f 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_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 8e1d22bc0..09b7af65d 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -44,7 +44,9 @@ void SoundDB::load()
void SoundDB::loadXmlFile(const std::string &fileName)
{
- XML::Document *doc = new XML::Document(fileName, UseResman_true, false);
+ XML::Document *doc = new XML::Document(fileName,
+ UseResman_true,
+ SkipError_false);
const XmlNodePtrConst root = doc->rootNode();
if (!root || !xmlNameEqual(root, "sounds"))
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 474e339ec..421915775 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -204,7 +204,9 @@ int inflateMemory(unsigned char *restrict const in,
void MapReader::addLayerToList(const std::string &fileName)
{
- XML::Document *doc = new XML::Document(fileName, UseResman_true, false);
+ XML::Document *doc = new XML::Document(fileName,
+ UseResman_true,
+ SkipError_false);
XmlNodePtrConst node = doc->rootNode();
if (!node)
{
@@ -236,7 +238,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, false);
+ XML::Document doc(realFilename, UseResman_true, SkipError_false);
if (!doc.isLoaded())
{
BLOCK_END("MapReader::readMap str")
@@ -894,7 +896,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node,
std::string filename = XML::getProperty(node, "source", "");
filename = resolveRelativePath(path, filename);
- doc = new XML::Document(filename, UseResman_true, false);
+ doc = new XML::Document(filename, UseResman_true, SkipError_false);
node = doc->rootNode();
if (!node)
{
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index d22cc7899..9dae7289e 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -87,7 +87,9 @@ SpriteDef *SpriteDef::load(const std::string &animationFile,
if (pos != std::string::npos)
palettes = animationFile.substr(pos + 1);
- XML::Document doc(animationFile.substr(0, pos), UseResman_true, false);
+ XML::Document doc(animationFile.substr(0, pos),
+ UseResman_true,
+ SkipError_false);
XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "sprite"))
@@ -434,7 +436,7 @@ void SpriteDef::includeSprite(const XmlNodePtr includeNode, const int variant)
}
mProcessedFiles.insert(filename);
- XML::Document doc(filename, UseResman_true, false);
+ XML::Document doc(filename, UseResman_true, SkipError_false);
const XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "sprite"))
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-05 22:12:04 +0000