Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / crosshairbutton.qc

diff --git a/qcsrc/menu/xonotic/crosshairbutton.qc b/qcsrc/menu/xonotic/crosshairbutton.qc
index 3b562cb776e4c3f8f2815c7046ccb1830f7d2d3b..4ed6352f923e8762b1466f93ec72e3c02356ee65 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairbutton.qc
+++ b/qcsrc/menu/xonotic/crosshairbutton.qc
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(XonoticCrosshairButton) EXTENDS(RadioButton)
+CLASS(XonoticCrosshairButton, RadioButton)
        METHOD(XonoticCrosshairButton, configureXonoticCrosshairButton, void(entity, float, float))
        METHOD(XonoticCrosshairButton, setChecked, void(entity, float))
        METHOD(XonoticCrosshairButton, draw, void(entity))
@@ -22,7 +22,7 @@ entity makeXonoticCrosshairButton(float, float);
 entity makeXonoticCrosshairButton(float theGroup, float theCrosshair)
 {
        entity me;
-       me = spawnXonoticCrosshairButton();
+       me = NEW(XonoticCrosshairButton);
        me.configureXonoticCrosshairButton(me, theGroup, theCrosshair);
        return me;
 }