diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-12-22 22:52:45 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-09 07:05:13 +0100 |
| commit | 8e0bc98ddf2e2c0810136d39141ee4f3de445131 (patch) | |
| tree | 9c46d14ef11880d06764802fc78f6c92f39a6ecd /src/resources | |
| parent | bb94a1c1906de4b7d71690f15f05f5fe9fbdb444 (diff) | |
| download | mana-8e0bc98ddf2e2c0810136d39141ee4f3de445131.tar.gz mana-8e0bc98ddf2e2c0810136d39141ee4f3de445131.tar.bz2 mana-8e0bc98ddf2e2c0810136d39141ee4f3de445131.tar.xz mana-8e0bc98ddf2e2c0810136d39141ee4f3de445131.zip | |
Spotted some more hard-coded files and paths definitions.
Conflicts:
src/actorsprite.cpp
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/colordb.cpp | 8 | ||||
| -rw-r--r-- | src/resources/theme.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index c35a5660..d0b46b4e 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -38,18 +38,18 @@ void ColorDB::load() if (mLoaded) unload(); - XML::Document *doc = new XML::Document("hair.xml"); + XML::Document *doc = new XML::Document(HAIR_XML_FILE); xmlNodePtr root = doc->rootNode(); bool hairXml = true; if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { - logger->log("Trying to fall back on colors.xml"); + logger->log("Trying to fall back on " COLORS_XML_FILE); hairXml = false; delete doc; - doc = new XML::Document("colors.xml"); + doc = new XML::Document(COLORS_XML_FILE); root = doc->rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) @@ -101,7 +101,7 @@ std::string &ColorDB::get(int id) if (i == mColors.end()) { - logger->log("ColorDB: Error, unknown dye ID# %d", id); + logger->log("ColorDB: Error, unknown dye Id# %d", id); return mFail; } else diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp index 869f225c..20573618 100644 --- a/src/resources/theme.cpp +++ b/src/resources/theme.cpp @@ -536,7 +536,7 @@ void Theme::loadColors(std::string file) if (file == "") file = defaultThemePath; - file += "/colors.xml"; + file += "/" COLORS_XML_FILE; XML::Document doc(file); xmlNodePtr root = doc.rootNode(); |