summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-30 21:06:40 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-30 21:06:40 +0300
commit238638aa184ada418c09d032f9a32eee64e5a69a (patch)
treeef8142abfdb91af9478e4544e894a80db322519e
parent69704874b67c3cae63ee7d27634bbffa4cc4f6e2 (diff)
downloadmv-238638aa184ada418c09d032f9a32eee64e5a69a.tar.gz
mv-238638aa184ada418c09d032f9a32eee64e5a69a.tar.bz2
mv-238638aa184ada418c09d032f9a32eee64e5a69a.tar.xz
mv-238638aa184ada418c09d032f9a32eee64e5a69a.zip
Dehardcode file name weapons.xml.
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/resources/db/weaponsdb.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index bbb0f467e..2745d6f29 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -598,6 +598,7 @@ DefaultsData* getPathsDefaults()
AddDEF("defaultcommandsPatchDir", "defaultcommands.d");
AddDEF("badgesFile", "badges.xml");
AddDEF("badgesPatchFile", "badges_patch.xml");
+ AddDEF("weaponsFile", "weapons.xml");
AddDEF("poisonEffectName", "poison");
AddDEF("cartEffectName", "cart");
AddDEF("ridingEffectName", "riding");
diff --git a/src/resources/db/weaponsdb.cpp b/src/resources/db/weaponsdb.cpp
index 75c951053..17ca96c9f 100644
--- a/src/resources/db/weaponsdb.cpp
+++ b/src/resources/db/weaponsdb.cpp
@@ -20,6 +20,8 @@
#include "resources/db/weaponsdb.h"
+#include "configuration.h"
+
#include "utils/xmlutils.h"
#include "debug.h"
@@ -34,7 +36,7 @@ namespace
static void loadDB(const std::string &name, WeaponsInfos &arr)
{
- readXmlIntVector("weapons.xml",
+ readXmlIntVector(paths.getStringValue("weaponsFile"),
"weapons",
name,
"item",