Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/menu/xonotic/cvarlist.qh b/qcsrc/menu/xonotic/cvarlist.qh
index 2c99866cf7671d7bf35c9cdf438c7f2dbcdeeea7..1260ae447a42d0162c4b9969e06217886fe7675a 100644 (file)
--- a/qcsrc/menu/xonotic/cvarlist.qh
+++ b/qcsrc/menu/xonotic/cvarlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticCvarList, XonoticListBox)
        METHOD(XonoticCvarList, configureXonoticCvarList, void(entity));
-       ATTRIB(XonoticCvarList, rowsPerItem, float, 1)
+       ATTRIB(XonoticCvarList, rowsPerItem, float, 1);
        METHOD(XonoticCvarList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCvarList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCvarList, keyDown, float(entity, float, float, float));
@@ -12,30 +12,30 @@ CLASS(XonoticCvarList, XonoticListBox)
 
        METHOD(XonoticCvarList, destroy, void(entity));
 
-       ATTRIB(XonoticCvarList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticCvarList, realUpperMargin, float, 0)
-       ATTRIB(XonoticCvarList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticCvarList, columnNameSize, float, 0)
-       ATTRIB(XonoticCvarList, columnValueOrigin, float, 0)
-       ATTRIB(XonoticCvarList, columnValueSize, float, 0)
+       ATTRIB(XonoticCvarList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticCvarList, realUpperMargin, float, 0);
+       ATTRIB(XonoticCvarList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticCvarList, columnNameSize, float, 0);
+       ATTRIB(XonoticCvarList, columnValueOrigin, float, 0);
+       ATTRIB(XonoticCvarList, columnValueSize, float, 0);
 
        METHOD(XonoticCvarList, mouseRelease, float(entity, vector));
        METHOD(XonoticCvarList, setSelected, void(entity, float));
        METHOD(XonoticCvarList, updateCvarType, float(entity));
 
-       ATTRIB(XonoticCvarList, controlledTextbox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarNameBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarDescriptionBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarTypeBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarValueBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarDefaultBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarNeedsForcing, float, 0)
+       ATTRIB(XonoticCvarList, controlledTextbox, entity);
+       ATTRIB(XonoticCvarList, cvarNameBox, entity);
+       ATTRIB(XonoticCvarList, cvarDescriptionBox, entity);
+       ATTRIB(XonoticCvarList, cvarTypeBox, entity);
+       ATTRIB(XonoticCvarList, cvarValueBox, entity);
+       ATTRIB(XonoticCvarList, cvarDefaultBox, entity);
+       ATTRIB(XonoticCvarList, cvarNeedsForcing, float, 0);
 
-       ATTRIB(XonoticCvarList, handle, float, -1)
-       ATTRIB(XonoticCvarList, cvarName, string, string_null)
-       ATTRIB(XonoticCvarList, cvarDescription, string, string_null)
-       ATTRIB(XonoticCvarList, cvarType, string, string_null)
-       ATTRIB(XonoticCvarList, cvarDefault, string, string_null)
+       ATTRIB(XonoticCvarList, handle, float, -1);
+       ATTRIB(XonoticCvarList, cvarName, string);
+       ATTRIB(XonoticCvarList, cvarDescription, string);
+       ATTRIB(XonoticCvarList, cvarType, string);
+       ATTRIB(XonoticCvarList, cvarDefault, string);
 ENDCLASS(XonoticCvarList)
 entity makeXonoticCvarList();
 void CvarList_Filter_Change(entity box, entity me);