diff --git a/src/v_draw.hpp b/src/v_draw.hpp index 9a9459d2e..0bce91304 100644 --- a/src/v_draw.hpp +++ b/src/v_draw.hpp @@ -155,9 +155,9 @@ public: Chain& clipy() { return clipy(y_, y_ + height_); } Chain& colormap(const UINT8* colormap); - Chain& colormap(skincolornum_t color); - Chain& colormap(INT32 skin, skincolornum_t color); - Chain& colorize(skincolornum_t color); + Chain& colormap(UINT16 color); + Chain& colormap(INT32 skin, UINT16 color); + Chain& colorize(UINT16 color); void text(const char* str) const { string(str, flags_, font_); } void text(const std::string& str) const { text(str.c_str()); } diff --git a/src/v_draw_setter.hpp b/src/v_draw_setter.hpp index 11b0b3e96..c0770ec97 100644 --- a/src/v_draw_setter.hpp +++ b/src/v_draw_setter.hpp @@ -103,19 +103,19 @@ inline Draw::Chain& Draw::Chain::colormap(const UINT8* colormap) return *this; } -inline Draw::Chain& Draw::Chain::colormap(skincolornum_t color) +inline Draw::Chain& Draw::Chain::colormap(UINT16 color) { - return colormap(R_GetTranslationColormap(TC_DEFAULT, color, GTC_CACHE)); + return colormap(R_GetTranslationColormap(TC_DEFAULT, static_cast(color), GTC_CACHE)); } -inline Draw::Chain& Draw::Chain::colormap(INT32 skin, skincolornum_t color) +inline Draw::Chain& Draw::Chain::colormap(INT32 skin, UINT16 color) { - return colormap(R_GetTranslationColormap(skin, color, GTC_CACHE)); + return colormap(R_GetTranslationColormap(skin, static_cast(color), GTC_CACHE)); } -inline Draw::Chain& Draw::Chain::colorize(skincolornum_t color) +inline Draw::Chain& Draw::Chain::colorize(UINT16 color) { - return colormap(R_GetTranslationColormap(TC_RAINBOW, color, GTC_CACHE)); + return colormap(R_GetTranslationColormap(TC_RAINBOW, static_cast(color), GTC_CACHE)); } }; // namespace srb2