From b96211a927451be61c1f2e5c5ff5b4873ccc2fdd Mon Sep 17 00:00:00 2001 From: Severin Meyer Date: Sat, 20 Sep 2014 19:47:13 +0200 Subject: [PATCH] Remove the colorbutton overlay image (gfx/menu/*/color) and directly colorize the button images (gfx/menu/*/colorbutton_*) --- qcsrc/menu/skin-customizables.inc | 1 - qcsrc/menu/xonotic/colorbutton.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc index a8846197b..6583898bc 100644 --- a/qcsrc/menu/skin-customizables.inc +++ b/qcsrc/menu/skin-customizables.inc @@ -203,7 +203,6 @@ SKINBEGIN // item: player color button SKINSTRING(GFX_COLORBUTTON, "colorbutton"); - SKINSTRING(GFX_COLORBUTTON_COLOR, "color"); // item: player model SKINVECTOR(COLOR_MODELTITLE, '1 1 1'); diff --git a/qcsrc/menu/xonotic/colorbutton.c b/qcsrc/menu/xonotic/colorbutton.c index 772c9e452..bcbdfee8d 100644 --- a/qcsrc/menu/xonotic/colorbutton.c +++ b/qcsrc/menu/xonotic/colorbutton.c @@ -3,9 +3,8 @@ CLASS(XonoticColorButton) EXTENDS(RadioButton) METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float)) METHOD(XonoticColorButton, setChecked, void(entity, float)) METHOD(XonoticColorButton, draw, void(entity)) - ATTRIB(XonoticColorButton, fontSize, float, SKINFONTSIZE_NORMAL) + ATTRIB(XonoticColorButton, fontSize, float, 0) ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON) - ATTRIB(XonoticColorButton, image2, string, SKINGFX_COLORBUTTON_COLOR) ATTRIB(XonoticColorButton, useDownAsChecked, float, 1) @@ -54,8 +53,6 @@ void XonoticColorButton_configureXonoticColorButton(entity me, float theGroup, f me.cvarPart = theColor; me.loadCvars(me); me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0); - me.srcMulti = 1; - me.src2 = me.image2; } void XonoticColorButton_setChecked(entity me, float val) { @@ -94,7 +91,10 @@ void XonoticColorButton_saveCvars(entity me) } void XonoticColorButton_draw(entity me) { - me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart); + me.color = colormapPaletteColor(me.cvarValueFloat, me.cvarPart); + me.colorC = me.color; + me.colorF = me.color; + me.colorD = me.color; SUPER(XonoticColorButton).draw(me); } #endif -- 2.39.2