Merge branch 'martin-t/damagetext' into 'master'

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

diff --git a/qcsrc/menu/item/borderimage.qh b/qcsrc/menu/item/borderimage.qh
index c956d362d22827af30204d1c7f2e45d561512ea7..9db9360f8f08a2fd2236a5ef17e7dbbf0f3c4ec0 100644 (file)
--- a/qcsrc/menu/item/borderimage.qh
+++ b/qcsrc/menu/item/borderimage.qh
@@ -5,21 +5,21 @@ CLASS(BorderImage, Label)
        METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float));
        METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(BorderImage, recalcPositionWithText, void(entity, string));
-       ATTRIB(BorderImage, isBold, float, 1)
+       ATTRIB(BorderImage, isBold, float, 1);
        METHOD(BorderImage, draw, void(entity));
-       ATTRIB(BorderImage, src, string, string_null)
-       ATTRIB(BorderImage, borderHeight, float, 0)
-       ATTRIB(BorderImage, borderVec, vector, '0 0 0')
-       ATTRIB(BorderImage, color, vector, '1 1 1')
-       ATTRIB(BorderImage, closeButton, entity, NULL)
-       ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0')
-       ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0')
-       ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
-       ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
-       ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
-       ATTRIB(BorderImage, overrideRealOrigin, vector, '0 1 0')
-       ATTRIB(BorderImage, saveRelOrigin, vector, '0 0 0')
-       ATTRIB(BorderImage, saveRelSize, vector, '0 0 0')
+       ATTRIB(BorderImage, src, string);
+       ATTRIB(BorderImage, borderHeight, float, 0);
+       ATTRIB(BorderImage, borderVec, vector, '0 0 0');
+       ATTRIB(BorderImage, color, vector, '1 1 1');
+       ATTRIB(BorderImage, closeButton, entity);
+       ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0');
+       ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0');
+       ATTRIB(BorderImage, isNexposeeTitleBar, float, 0);
+       ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0);
+       ATTRIB(BorderImage, zoomedOutTitleBar, float, 0);
+       ATTRIB(BorderImage, overrideRealOrigin, vector, '0 1 0');
+       ATTRIB(BorderImage, saveRelOrigin, vector, '0 0 0');
+       ATTRIB(BorderImage, saveRelSize, vector, '0 0 0');
 ENDCLASS(BorderImage)
 
 .vector colorC, colorF;