From b0475c40bb256107aa13919b8d020b172af9d788 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 14 May 2009 10:43:18 -0600 Subject: Make sure to use our hair color file first --- src/resources/colordb.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/resources') 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 -#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; -- cgit v1.2.3-60-g2f50