Move dye related files into dye directory.

24 files changed, 66 insertions, 53 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a980ec19..c07b1d2c3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -622,11 +622,11 @@ SET(SRCS
     resources/delayedmanager.h
     resources/db/deaddb.cpp
     resources/db/deaddb.h
-    resources/dye.cpp
-    resources/dye.h
-    resources/dyecolor.h
-    resources/dyepalette.cpp
-    resources/dyepalette.h
+    resources/dye/dye.cpp
+    resources/dye/dye.h
+    resources/dye/dyecolor.h
+    resources/dye/dyepalette.cpp
+    resources/dye/dyepalette.h
     resources/effectdescription.h
     resources/emoteinfo.h
     resources/emotesprite.h
@@ -1336,10 +1336,10 @@ SET(DYE_CMD_SRCS
     resources/db/palettedb.h
     resources/delayedmanager.cpp
     resources/delayedmanager.h
-    resources/dye.cpp
-    resources/dye.h
-    resources/dyepalette.cpp
-    resources/dyepalette.h
+    resources/dye/dye.cpp
+    resources/dye/dye.h
+    resources/dye/dyepalette.cpp
+    resources/dye/dyepalette.h
     resources/effectdescription.h
     resources/emoteinfo.h
     resources/emotesprite.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d11d4b5cb..10f5afb7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -320,11 +320,11 @@ SRC += events/actionevent.h \
 	      resources/attack.h \
 	      resources/cursor.cpp \
 	      resources/cursor.h \
-	      resources/dye.cpp \
-	      resources/dye.h \
-	      resources/dyecolor.h \
-	      resources/dyepalette.cpp \
-	      resources/dyepalette.h \
+	      resources/dye/dye.cpp \
+	      resources/dye/dye.h \
+	      resources/dye/dyecolor.h \
+	      resources/dye/dyepalette.cpp \
+	      resources/dye/dyepalette.h \
 	      resources/fboinfo.h \
 	      resources/frame.h \
 	      resources/image.cpp \
@@ -1689,7 +1689,7 @@ manaplustests_SOURCES = ${manaplus_SOURCES} \
 	      utils/mathutils_unittest.cc \
 	      utils/stringutils_unittest.cc \
 	      utils/xmlutils_unittest.cc \
-	      resources/dye_unittest.cc \
+	      resources/dye/dye_unittest.cc \
 	      resources/mstack_unittest.cc
 endif
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index c98e463dc..9da58cd13 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -32,11 +32,12 @@
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
-#include "resources/dyepalette.h"
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dyepalette.h"
+
 #include "utils/dtor.h"
 #include "utils/files.h"
 #include "utils/physfstools.h"
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index dc566bb4e..8fd4ecead 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -23,7 +23,6 @@
 #include "particle/particle.h"
 
 #include "configuration.h"
-#include "resources/dye.h"
 #include "logger.h"
 
 #include "particle/animationparticle.h"
@@ -33,6 +32,8 @@
 
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "utils/dtor.h"
 #include "utils/mathutils.h"
 
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 739bd915b..b0c5f7e9c 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -29,11 +29,12 @@
 #include "particle/animationparticle.h"
 #include "particle/rotationalparticle.h"
 
-#include "resources/dye.h"
 #include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "debug.h"
 
 static const float SIN45 = 0.707106781F;
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index a81a6c10d..345720442 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -33,7 +33,6 @@
 #include "utils/physfsrwops.h"
 #include "utils/sdlcheckutils.h"
 
-#include "resources/dye.h"
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 #include "resources/resourcemanager.h"
@@ -43,6 +42,8 @@
 #include "resources/atlas/atlasresource.h"
 #include "resources/atlas/textureatlas.h"
 
+#include "resources/dye/dye.h"
+
 #include "debug.h"
 
 AtlasManager::AtlasManager()
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index fe2fc3bae..12a807fc2 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/files.h"
 
-#include "resources/dyecolor.h"
+#include "resources/dye/dyecolor.h"
 
 #include <map>
 
diff --git a/src/resources/dye.cpp b/src/resources/dye/dye.cpp
index c7287ee8a..3b7904122 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye/dye.cpp
@@ -20,11 +20,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/dye.h"
+#include "resources/dye/dye.h"
 
 #include "logger.h"
 
-#include "resources/dyepalette.h"
+#include "resources/dye/dyepalette.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/resources/dye.h b/src/resources/dye/dye.h
index 353092ddf..02e1b3f05 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye/dye.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_DYE_H
-#define RESOURCES_DYE_H
+#ifndef RESOURCES_DYE_DYE_H
+#define RESOURCES_DYE_DYE_H
 
 #include <string>
 
@@ -90,4 +90,4 @@ class Dye final
         DyePalette *mDyePalettes[dyePalateSize];
 };
 
-#endif  // RESOURCES_DYE_H
+#endif  // RESOURCES_DYE_DYE_H
diff --git a/src/resources/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index aeee85e12..1ee109ffa 100644
--- a/src/resources/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -20,9 +20,8 @@
 
 #include "catch.hpp"
 
-#include "resources/dye.h"
-
-#include "resources/dyepalette.h"
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
 
 #include "debug.h"
 
diff --git a/src/resources/dyecolor.h b/src/resources/dye/dyecolor.h
index 2a3b32968..4e8864c66 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dye/dyecolor.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_DYECOLOR_H
-#define RESOURCES_DYECOLOR_H
+#ifndef RESOURCES_DYE_DYECOLOR_H
+#define RESOURCES_DYE_DYECOLOR_H
 
 #include "localconsts.h"
 
@@ -50,4 +50,4 @@ struct DyeColor final
     uint8_t value[4];
 };
 
-#endif  // RESOURCES_DYECOLOR_H
+#endif  // RESOURCES_DYE_DYECOLOR_H
diff --git a/src/resources/dyepalette.cpp b/src/resources/dye/dyepalette.cpp
index 4ff93c1f1..2dd71f2ec 100644
--- a/src/resources/dyepalette.cpp
+++ b/src/resources/dye/dyepalette.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/dyepalette.h"
+#include "resources/dye/dyepalette.h"
 
 #include "logger.h"
 
diff --git a/src/resources/dyepalette.h b/src/resources/dye/dyepalette.h
index 467ec0ac1..33d16fa50 100644
--- a/src/resources/dyepalette.h
+++ b/src/resources/dye/dyepalette.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_DYEPALETTE_H
-#define RESOURCES_DYEPALETTE_H
+#ifndef RESOURCES_DYE_DYEPALETTE_H
+#define RESOURCES_DYE_DYEPALETTE_H
 
-#include "resources/dyecolor.h"
+#include "resources/dye/dyecolor.h"
 
 #include <string>
 #include <vector>
@@ -85,4 +85,4 @@ class DyePalette final
         std::vector<DyeColor> mColors;
 };
 
-#endif  // RESOURCES_DYEPALETTE_H
+#endif  // RESOURCES_DYE_DYEPALETTE_H
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 18e415972..c46c4e09c 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -24,8 +24,8 @@
 
 #include "logger.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
 
 #include "utils/sdlcheckutils.h"
 
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 8cdf6beec..da6fba531 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,10 +39,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
 #include "resources/image.h"
 
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index cf16c77d6..3b624a2a9 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -32,13 +32,14 @@
 #include "resources/atlas/atlasmanager.h"
 #include "resources/atlas/atlasresource.h"
 #endif
-#include "resources/dye.h"
 #include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/imageset.h"
 #include "resources/sdlmusic.h"
 #include "resources/soundeffect.h"
 
+#include "resources/dye/dye.h"
+
 #include "resources/sprite/spritedef.h"
 
 #include "utils/delete2.h"
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index da6b750dd..0f12a746f 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -36,10 +36,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
 #include "resources/image.h"
 
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index 41ce52cdd..184174bce 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -24,10 +24,11 @@
 
 #include "resources/sdl2imagehelper.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
+
 #include "logger.h"
 #include "main.h"
 
diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp
index b8bd7f6f4..a28bea0c6 100644
--- a/src/resources/sdl2softwareimagehelper.cpp
+++ b/src/resources/sdl2softwareimagehelper.cpp
@@ -24,9 +24,10 @@
 
 #include "resources/sdl2softwareimagehelper.h"
 
-#include "resources/dye.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "logger.h"
 #include "main.h"
 
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index e0018b868..89bd36958 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -27,10 +27,11 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
 #include "resources/image.h"
 
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_gfxBlitFunc.h>
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index dda4a8378..42c076f5a 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -32,10 +32,11 @@
 
 #include "resources/action.h"
 #include "resources/animation.h"
-#include "resources/dye.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "resources/sprite/spritereference.h"
 
 #include "debug.h"
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index 9e31e9c6f..dbaf0516e 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -24,9 +24,10 @@
 
 #include "resources/surfaceimagehelper.h"
 
-#include "resources/dye.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "logger.h"
 #include "main.h"
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 9a82fe9fa..877b51e7c 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -27,10 +27,11 @@
 #include "render/graphics.h"
 
 #include "resources/animation.h"
-#include "resources/dye.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/dye/dye.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 7f8dc0d2a..6dc659685 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -37,8 +37,6 @@
 #include "utils/physfscheckutils.h"
 #include "utils/physfsrwops.h"
 
-#include "resources/dye.h"
-#include "resources/dyepalette.h"
 #include "resources/image.h"
 #include "resources/imagewriter.h"
 #include "resources/mstack.h"
@@ -47,6 +45,9 @@
 #include "resources/surfaceimagehelper.h"
 #include "resources/wallpaper.h"
 
+#include "resources/dye/dye.h"
+#include "resources/dye/dyepalette.h"
+
 #include <unistd.h>
 
 #ifdef WIN32