From 4159ba015c5f2035d188367d85d85052a7673cdc Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Wed, 18 Jan 2012 18:10:26 +0100 Subject: ColorDB -> HairDB. This will ease the reading of the next patch about hair handling at character creation time in tAthena. As requested by bjorn. Reviewed-by: bjorn --- src/resources/colordb.cpp | 116 --------------------------------------------- src/resources/colordb.h | 51 -------------------- src/resources/hairdb.cpp | 117 ++++++++++++++++++++++++++++++++++++++++++++++ src/resources/hairdb.h | 52 +++++++++++++++++++++ 4 files changed, 169 insertions(+), 167 deletions(-) delete mode 100644 src/resources/colordb.cpp delete mode 100644 src/resources/colordb.h create mode 100644 src/resources/hairdb.cpp create mode 100644 src/resources/hairdb.h (limited to 'src/resources') diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp deleted file mode 100644 index d0b46b4e..00000000 --- a/src/resources/colordb.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Color database - * Copyright (C) 2008 Aethyra Development Team - * - * This file is part of The Mana Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "resources/colordb.h" - -#include "log.h" - -#include "utils/xml.h" - -#include - -namespace -{ - ColorDB::Colors mColors; - bool mLoaded = false; - std::string mFail = "#ffffff"; -} - -void ColorDB::load() -{ - if (mLoaded) - unload(); - - 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_FILE); - - hairXml = false; - - delete doc; - doc = new XML::Document(COLORS_XML_FILE); - root = doc->rootNode(); - - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) - { - logger->log("ColorDB: Failed to find any color files."); - mColors[0] = mFail; - mLoaded = true; - - delete doc; - - return; - } - } - for_each_xml_child_node(node, root) - { - if (xmlStrEqual(node->name, BAD_CAST "color")) - { - int id = XML::getProperty(node, "id", 0); - - if (mColors.find(id) != mColors.end()) - { - logger->log("ColorDB: Redefinition of dye ID %d", id); - } - - mColors[id] = hairXml ? XML::getProperty(node, "value", "#FFFFFF") : - XML::getProperty(node, "dye", "#FFFFFF"); - } - } - - delete doc; - - mLoaded = true; -} - -void ColorDB::unload() -{ - logger->log("Unloading color database..."); - - mColors.clear(); - mLoaded = false; -} - -std::string &ColorDB::get(int id) -{ - if (!mLoaded) - load(); - - ColorIterator i = mColors.find(id); - - if (i == mColors.end()) - { - logger->log("ColorDB: Error, unknown dye Id# %d", id); - return mFail; - } - else - { - return i->second; - } -} - -int ColorDB::size() -{ - return mColors.size(); -} diff --git a/src/resources/colordb.h b/src/resources/colordb.h deleted file mode 100644 index 57b52388..00000000 --- a/src/resources/colordb.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Color database - * Copyright (C) 2008 Aethyra Development Team - * - * This file is part of The Mana Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef COLOR_MANAGER_H -#define COLOR_MANAGER_H - -#include -#include - -/** - * Color information database. - */ -namespace ColorDB -{ - /** - * Loads the color data from colors.xml. - */ - void load(); - - /** - * Clear the color data - */ - void unload(); - - std::string &get(int id); - - int size(); - - // Color DB - typedef std::map Colors; - typedef Colors::iterator ColorIterator; -} - -#endif diff --git a/src/resources/hairdb.cpp b/src/resources/hairdb.cpp new file mode 100644 index 00000000..abf64bd5 --- /dev/null +++ b/src/resources/hairdb.cpp @@ -0,0 +1,117 @@ +/* + * Color database + * Copyright (C) 2008 Aethyra Development Team + * Copyright (C) 2009-2012 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "resources/hairdb.h" + +#include "log.h" + +#include "utils/xml.h" + +#include + +namespace +{ + HairDB::Colors mColors; + bool mLoaded = false; + std::string mFail = "#ffffff"; +} + +void HairDB::load() +{ + if (mLoaded) + unload(); + + 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_FILE); + + hairXml = false; + + delete doc; + doc = new XML::Document(COLORS_XML_FILE); + root = doc->rootNode(); + + if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + { + logger->log("ColorDB: Failed to find any color files."); + mColors[0] = mFail; + mLoaded = true; + + delete doc; + + return; + } + } + for_each_xml_child_node(node, root) + { + if (xmlStrEqual(node->name, BAD_CAST "color")) + { + int id = XML::getProperty(node, "id", 0); + + if (mColors.find(id) != mColors.end()) + { + logger->log("ColorDB: Redefinition of dye ID %d", id); + } + + mColors[id] = hairXml ? XML::getProperty(node, "value", "#FFFFFF") : + XML::getProperty(node, "dye", "#FFFFFF"); + } + } + + delete doc; + + mLoaded = true; +} + +void HairDB::unload() +{ + logger->log("Unloading color database..."); + + mColors.clear(); + mLoaded = false; +} + +std::string &HairDB::get(int id) +{ + if (!mLoaded) + load(); + + ColorIterator i = mColors.find(id); + + if (i == mColors.end()) + { + logger->log("ColorDB: Error, unknown dye Id# %d", id); + return mFail; + } + else + { + return i->second; + } +} + +int HairDB::size() +{ + return mColors.size(); +} diff --git a/src/resources/hairdb.h b/src/resources/hairdb.h new file mode 100644 index 00000000..c29dbb83 --- /dev/null +++ b/src/resources/hairdb.h @@ -0,0 +1,52 @@ +/* + * Color database + * Copyright (C) 2008 Aethyra Development Team + * Copyright (C) 2009-2012 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef HAIR_MANAGER_H +#define HAIR_MANAGER_H + +#include +#include + +/** + * Hair information database. + */ +namespace HairDB +{ + /** + * Loads the color data from colors.xml. + */ + void load(); + + /** + * Clear the color data + */ + void unload(); + + std::string &get(int id); + + int size(); + + // Hair Color DB + typedef std::map Colors; + typedef Colors::iterator ColorIterator; +} + +#endif -- cgit v1.2.3-70-g09d2