summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-05-14 10:43:18 -0600
committerJared Adams <jaxad0127@gmail.com>2009-05-14 10:43:18 -0600
commitb0475c40bb256107aa13919b8d020b172af9d788 (patch)
tree0214d1d595e591571ee2851e38a1500c99cbadaa /src/resources
parent2032ca0fb1fd6b59c025180b673e6760d9c12bdc (diff)
downloadmana-b0475c40bb256107aa13919b8d020b172af9d788.tar.gz
mana-b0475c40bb256107aa13919b8d020b172af9d788.tar.bz2
mana-b0475c40bb256107aa13919b8d020b172af9d788.tar.xz
mana-b0475c40bb256107aa13919b8d020b172af9d788.zip
Make sure to use our hair color file first
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/colordb.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index af498297..12806f8e 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -27,8 +27,8 @@
#include <libxml/tree.h>
-#define HAIR_COLOR_FILE "colors.xml"
-#define TMW_COLOR_FILE "hair.xml"
+#define HAIR_COLOR_FILE "hair.xml"
+#define AE_COLOR_FILE "colors.xml"
namespace
{
@@ -48,17 +48,17 @@ void ColorDB::load()
if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
{
- logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
+ logger->log("Trying Aethyra's color file, %s.", AE_COLOR_FILE);
TMWHair = true;
delete doc;
- doc = new XML::Document(TMW_COLOR_FILE);
+ doc = new XML::Document(AE_COLOR_FILE);
root = doc->rootNode();
if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
{
- logger->log("ColorDB: Failed");
+ logger->log("ColorDB: Failed to find any color files.");
mColors[0] = mFail;
mLoaded = true;