From fdc24c062eb4a73aa81b941b67d277691d6dd5a1 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 2 Dec 2008 11:19:57 -0700 Subject: Changed colordb to only use one XML::Document pointer, instead of instantiating two XML::Document variables. Probably was a bit tired the day I made that fix, so I missed the obvious solution. Signed-off-by: Ira Rice --- src/resources/colordb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/resources/colordb.cpp') diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 2340a8f2..bb5bd0d1 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -46,9 +46,8 @@ void ColorDB::load() return; } - XML::Document doc(HAIR_COLOR_FILE); - XML::Document doc2(TMW_COLOR_FILE); - xmlNodePtr root = doc.rootNode(); + XML::Document *doc = new XML::Document(HAIR_COLOR_FILE); + xmlNodePtr root = doc->rootNode(); bool TMWHair = false; if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) @@ -56,7 +55,8 @@ void ColorDB::load() logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE); TMWHair = true; - root = doc2.rootNode(); + doc = new XML::Document(TMW_COLOR_FILE); + root = doc->rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { logger->log("ColorDB: Failed"); -- cgit v1.2.3-70-g09d2