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

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

diff --git a/qcsrc/menu/oo/implementation.qc b/qcsrc/menu/oo/implementation.qc
index d011523609983a597aaffe9486c0fe49a8b36522..78cba1ddb5abf407cc45e847cf33d0536ced7018 100644 (file)
--- a/qcsrc/menu/oo/implementation.qc
+++ b/qcsrc/menu/oo/implementation.qc
@@ -8,7 +8,6 @@
 
 #ifdef CLASS
 #undef CLASS
-#undef EXTENDS
 #undef METHOD
 #undef ATTRIB
 #undef ATTRIBARRAY
@@ -17,8 +16,7 @@
 #endif
 
 // for the constructor
-#define CLASS(cname)                       entity spawn##cname() { entity me;
-#define EXTENDS(base)                      me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl;
+#define CLASS(cname,base)                  entity spawn##cname() { entity me = spawn##base (); entity basevtbl; basevtbl = base##_vtbl;
 #define METHOD(cname,name,prototype)       me.name = cname##_##name;
 #define ATTRIB(cname,name,type,val)        me.name = val;
 #define ATTRIBARRAY(cname,name,type,cnt)