diff --git a/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp index 658a431dd2..7a31ac4161 100644 --- a/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp +++ b/src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp @@ -28,7 +28,6 @@ #include "texturemanager.h" #include "templates.h" #include "stats.h" -#include "colormaps.h" Postprocess hw_postprocess; diff --git a/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp index 9bbdd70723..7ce16369b4 100644 --- a/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp +++ b/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp @@ -28,7 +28,6 @@ #include "v_text.h" #include "i_video.h" #include "v_draw.h" -#include "colormaps.h" #include "hw_clock.h" #include "hw_vrmodes.h" diff --git a/src/common/utility/palutil.h b/src/common/utility/palutil.h index b1dcca40a6..07f796f8e0 100644 --- a/src/common/utility/palutil.h +++ b/src/common/utility/palutil.h @@ -63,3 +63,13 @@ int AddSpecialColormap(PalEntry *pe, float r1, float g1, float b1, float r2, flo void InitSpecialColormaps(PalEntry* pe); void UpdateSpecialColormap(PalEntry* BaseColors, unsigned int index, float r1, float g1, float b1, float r2, float g2, float b2); int ReadPalette(int lumpnum, uint8_t* buffer); + +enum EColorManipulation +{ + CM_PLAIN2D = -2, // regular 2D drawing. + CM_INVALID = -1, + CM_DEFAULT = 0, // untranslated + CM_FIRSTSPECIALCOLORMAP, // first special fixed colormap +}; + +#define CM_MAXCOLORMAP int(CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size()) diff --git a/src/r_data/colormaps.h b/src/r_data/colormaps.h index 58381f15d4..e7ee2be429 100644 --- a/src/r_data/colormaps.h +++ b/src/r_data/colormaps.h @@ -43,13 +43,4 @@ inline uint32_t MakeSpecialColormap(int index) return index | SPECIALCOLORMAP_MASK; } -enum EColorManipulation -{ - CM_DEFAULT = 0, // untranslated - CM_FIRSTSPECIALCOLORMAP, // first special fixed colormap -}; - -#define CM_MAXCOLORMAP int(CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size()) - - #endif