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

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

diff --git a/qcsrc/menu/xonotic/commandbutton.qc b/qcsrc/menu/xonotic/commandbutton.qc
index 8ee4e7de3a75503215591c49e643a68768c580bf..e0c17d55c60738d0173eb96cde8def83c6562e86 100644 (file)
--- a/qcsrc/menu/xonotic/commandbutton.qc
+++ b/qcsrc/menu/xonotic/commandbutton.qc
@@ -5,7 +5,7 @@
 #endif
 
 #ifdef INTERFACE
-CLASS(XonoticCommandButton) EXTENDS(XonoticButton)
+CLASS(XonoticCommandButton, XonoticButton)
        METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float))
        ATTRIB(XonoticCommandButton, onClickCommand, string, string_null)
        ATTRIB(XonoticCommandButton, flags, float, 0)
@@ -17,7 +17,7 @@ entity makeXonoticCommandButton(string theText, vector theColor, string theComma
 entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, float theFlags)
 {
        entity me;
-       me = spawnXonoticCommandButton();
+       me = NEW(XonoticCommandButton);
        me.configureXonoticCommandButton(me, theText, theColor, theCommand, theFlags);
        return me;
 }