Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/menu/xonotic/colorpicker_string.qh b/qcsrc/menu/xonotic/colorpicker_string.qh
index 3caf9d9bf0d5a9d891a828527cefa6bd3aa6c570..e990234b3f0a24779b9e3b40da6850b31299cd82 100644 (file)
--- a/qcsrc/menu/xonotic/colorpicker_string.qh
+++ b/qcsrc/menu/xonotic/colorpicker_string.qh
@@ -9,15 +9,15 @@ CLASS(XonoticColorpickerString, Image)
        METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector));
        METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector));
 
-       ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
+       ATTRIB(XonoticColorpickerString, cvarName, string);
        METHOD(XonoticColorpickerString, loadCvars, void(entity));
        METHOD(XonoticColorpickerString, saveCvars, void(entity));
 
-       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
-       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
-       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
-       ATTRIB(XonoticColorpickerString, focusable, float, 1)
+       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0');
+       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER);
+       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER);
+       ATTRIB(XonoticColorpickerString, focusable, float, 1);
        METHOD(XonoticColorpickerString, draw, void(entity));
-       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3)
+       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3);
 ENDCLASS(XonoticColorpickerString)
 entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar);