diff options
Diffstat (limited to 'src/resources/db')
| -rw-r--r-- | src/resources/db/colordb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/colordb.h | 29 |
2 files changed, 3 insertions, 28 deletions
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 088bb8832..f4cd0921b 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -214,7 +214,7 @@ int ColorDB::getHairSize() return mHairColorsSize; } -const std::map <ItemColor, ColorDB::ItemColorData> +const std::map <ItemColor, ItemColorData> *ColorDB::getColorsList(const std::string &name) { const ColorListsIterator it = mColorLists.find(name); diff --git a/src/resources/db/colordb.h b/src/resources/db/colordb.h index d4e0ecb29..5189d7c85 100644 --- a/src/resources/db/colordb.h +++ b/src/resources/db/colordb.h @@ -22,11 +22,11 @@ #ifndef RESOURCES_DB_COLORDB_H #define RESOURCES_DB_COLORDB_H -#include "enums/simpletypes/itemcolor.h" #include "enums/simpletypes/skiperror.h" +#include "resources/itemcolordata.h" + #include <map> -#include <string> #include "localconsts.h" @@ -35,31 +35,6 @@ */ namespace ColorDB { - class ItemColorData final - { - public: - ItemColorData() : - id(ItemColor_zero), - name(), - color() - { } - - ItemColorData(const ItemColor id0, - const std::string &name0, - const std::string &color0) : - id(id0), - name(name0), - color(color0) - { - } - - A_DEFAULT_COPY(ItemColorData) - - ItemColor id; - std::string name; - std::string color; - }; - /** * Loads the color data from <code>colors.xml</code>. */ |