Fix GetField_fullspawndata sometimes taking the wrong code path

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / checkbox_string.qh

diff --git a/qcsrc/menu/xonotic/checkbox_string.qh b/qcsrc/menu/xonotic/checkbox_string.qh
index b4dc8e5d20e6aefe2db6657dd1982e4ace9d64fe..8f014020e70c96b94841f71d581e47359731490e 100644 (file)
--- a/qcsrc/menu/xonotic/checkbox_string.qh
+++ b/qcsrc/menu/xonotic/checkbox_string.qh
@@ -4,22 +4,22 @@
 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)
+       ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX);
+       ATTRIB(XonoticCheckBoxString, yesString, string);
+       ATTRIB(XonoticCheckBoxString, noString, string);
 
-       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, 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)
+       ATTRIB(XonoticCheckBoxString, controlledCvar, string);
        METHOD(XonoticCheckBoxString, loadCvars, void(entity));
        METHOD(XonoticCheckBoxString, saveCvars, void(entity));
-       ATTRIB(XonoticCheckBoxString, sendCvars, float, 0)
+       ATTRIB(XonoticCheckBoxString, sendCvars, float, 0);
 
-       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED);
 ENDCLASS(XonoticCheckBoxString)
 entity makeXonoticCheckBoxString(string, string, string, string);