X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcheckbox_string.qc;h=99db16e35bd483bb6e4136a2d017cd2d4e003065;hb=0d4410adb034af1a9989862211e49e442fa9b9dd;hp=4b5b17f0e17c5b56c1d6680fdf02f8d584fa6174;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/checkbox_string.qc b/qcsrc/menu/xonotic/checkbox_string.qc
index 4b5b17f0e..99db16e35 100644
--- a/qcsrc/menu/xonotic/checkbox_string.qc
+++ b/qcsrc/menu/xonotic/checkbox_string.qc
@@ -1,31 +1,5 @@
-#ifndef CHECKBOX_STRING_H
-#define CHECKBOX_STRING_H
-#include "../item/checkbox.qc"
-CLASS(XonoticCheckBoxString, CheckBox)
-	METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string));
-	METHOD(XonoticCheckBoxString, setChecked, void(entity, float));
-	ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL)
-	ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX)
-	ATTRIB(XonoticCheckBoxString, yesString, string, string_null)
-	ATTRIB(XonoticCheckBoxString, noString, string, string_null)
+#include "checkbox_string.qh"
 
-	ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N)
-	ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C)
-	ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F)
-	ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D)
-
-	ATTRIB(XonoticCheckBoxString, cvarName, string, string_null)
-	METHOD(XonoticCheckBoxString, loadCvars, void(entity));
-	METHOD(XonoticCheckBoxString, saveCvars, void(entity));
-	ATTRIB(XonoticCheckBoxString, sendCvars, float, 0)
-
-	ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT)
-	ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED)
-ENDCLASS(XonoticCheckBoxString)
-entity makeXonoticCheckBoxString(string, string, string, string);
-#endif
-
-#ifdef IMPLEMENTATION
 entity makeXonoticCheckBoxString(string theYesValue, string theNoValue, string theCvar, string theText)
 {
 	entity me;
@@ -38,12 +12,8 @@ void XonoticCheckBoxString_configureXonoticCheckBoxString(entity me, string theY
 	me.yesString = theYesValue;
 	me.noString = theNoValue;
 	me.checked = 0;
-	if(theCvar)
-	{
-		me.cvarName = theCvar;
-		me.tooltip = getZonedTooltipForIdentifier(theCvar);
-		me.loadCvars(me);
-	}
+	me.cvarName = (theCvar) ? theCvar : string_null;
+	me.loadCvars(me);
 	me.configureCheckBox(me, theText, me.fontSize, me.image);
 }
 void XonoticCheckBoxString_setChecked(entity me, float foo)
@@ -71,4 +41,3 @@ void XonoticCheckBoxString_saveCvars(entity me)
 
 	CheckSendCvars(me, me.cvarName);
 }
-#endif