X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcheckbox_slider_invalid.qc;h=839e66b215dc45765a64e4f9aa52902bed9e9a20;hb=65b54b5967f0a152ff308a37196a583e816c1f72;hp=e3043184a44f35cd2676375466fff57ec9c91014;hpb=4dd3c23aa51dd6fe855d8c5d97126a12a372eb3b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc
index e3043184a..839e66b21 100644
--- a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc
+++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc
@@ -1,32 +1,11 @@
-#ifdef INTERFACE
-CLASS(XonoticSliderCheckBox) EXTENDS(CheckBox)
-	METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string))
-	METHOD(XonoticSliderCheckBox, setChecked, void(entity, float))
-	METHOD(XonoticSliderCheckBox, draw, void(entity))
-	ATTRIB(XonoticSliderCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-	ATTRIB(XonoticSliderCheckBox, image, string, SKINGFX_CHECKBOX)
+#include "checkbox_slider_invalid.qh"
 
-	ATTRIB(XonoticSliderCheckBox, color, vector, SKINCOLOR_CHECKBOX_N)
-	ATTRIB(XonoticSliderCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C)
-	ATTRIB(XonoticSliderCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F)
-	ATTRIB(XonoticSliderCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D)
+#include "slider.qh"
 
-	ATTRIB(XonoticSliderCheckBox, alpha, float, SKINALPHA_TEXT)
-	ATTRIB(XonoticSliderCheckBox, disabledAlpha, float, SKINALPHA_DISABLED)
-
-	ATTRIB(XonoticSliderCheckBox, controlledSlider, entity, NULL)
-	ATTRIB(XonoticSliderCheckBox, offValue, float, -1)
-	ATTRIB(XonoticSliderCheckBox, inverted, float, 0)
-	ATTRIB(XonoticSliderCheckBox, savedValue, float, -1)
-ENDCLASS(XonoticSliderCheckBox)
-entity makeXonoticSliderCheckBox(float, float, entity, string);
-#endif
-
-#ifdef IMPLEMENTATION
 entity makeXonoticSliderCheckBox(float theOffValue, float isInverted, entity theControlledSlider, string theText)
 {
 	entity me;
-	me = spawnXonoticSliderCheckBox();
+	me = NEW(XonoticSliderCheckBox);
 	me.configureXonoticSliderCheckBox(me, theOffValue, isInverted, theControlledSlider, theText);
 	return me;
 }
@@ -41,8 +20,8 @@ void XonoticSliderCheckBox_configureXonoticSliderCheckBox(entity me, float theOf
 		me.savedValue = theControlledSlider.valueMin;
 	me.controlledSlider = theControlledSlider;
 	me.configureCheckBox(me, theText, me.fontSize, me.image);
-	me.tooltip = theControlledSlider.tooltip;
 	me.cvarName = theControlledSlider.cvarName; // in case we want to display the cvar in the tooltip
+	me.tooltip = theControlledSlider.tooltip;
 }
 void XonoticSliderCheckBox_draw(entity me)
 {
@@ -61,5 +40,3 @@ void XonoticSliderCheckBox_setChecked(entity me, float val)
 	else
 		me.controlledSlider.setValue(me.controlledSlider, me.offValue);
 }
-
-#endif