From 8167471e438210f4a81fca8d2c70f52bb736983f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Jun 2017 19:47:54 +0300 Subject: Move itemcolordata into separate file. --- src/resources/db/colordb.h | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'src/resources/db/colordb.h') 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 -#include #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 colors.xml. */ -- cgit v1.2.3-60-g2f50