also rename vtblClass to Class_vtbl

diff --git a/qcsrc/menu/oo/base.h b/qcsrc/menu/oo/base.h
index 2a413a6937bc33786b1c4dd90db1c4df5a4ba2bd..3553d447a81fae55be9e7ab50cd2c17257fb594f 100644 (file)
--- a/qcsrc/menu/oo/base.h
+++ b/qcsrc/menu/oo/base.h
@@ -1,5 +1,5 @@
 .string classname;
-entity vtblObject;
+entity Object_vtbl;
 .string vtblname;
 .entity vtblbase;
 entity spawnVtbl(entity e, entity b)
@@ -20,7 +20,7 @@ entity spawnObject()
        entity e;
        e = spawn();
        e.classname = "Object";
-       if(!vtblObject)
-               vtblObject = spawnVtbl(e, null_entity);
+       if(!Object_vtbl)
+               Object_vtbl = spawnVtbl(e, null_entity);
        return e;
 }

diff --git a/qcsrc/menu/oo/classdefs.h b/qcsrc/menu/oo/classdefs.h
index f84d133116449eed4806b0154ac9315989d1b76c..85bc6c2afa9fe6678c7f239de9343c649f7a4ad9 100644 (file)
--- a/qcsrc/menu/oo/classdefs.h
+++ b/qcsrc/menu/oo/classdefs.h
@@ -16,7 +16,7 @@
 #undef SUPER
 #endif
 
-#define CLASS(cname)                       entity spawn##cname(); entity vtbl##cname;
+#define CLASS(cname)                       entity spawn##cname(); entity cname##_vtbl;
 #define EXTENDS(base)                
 #define METHOD(cname,name,prototype)       prototype cname##_##name; .prototype name;
 #define ATTRIB(cname,name,type,val)        .type name;

diff --git a/qcsrc/menu/oo/constructors.h b/qcsrc/menu/oo/constructors.h
index 5533c8ce89f3d206e8724ee8c6f736ef9ac7fd28..4e758dd4727ad4c29012239b9166f40800826a2a 100644 (file)
--- a/qcsrc/menu/oo/constructors.h
+++ b/qcsrc/menu/oo/constructors.h
@@ -17,9 +17,9 @@
 #endif
 
 #define CLASS(cname)                       entity spawn##cname() { entity me;
-#define EXTENDS(base)                      me = spawn##base (); entity basevtbl; basevtbl = vtbl##base;
+#define EXTENDS(base)                      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)   me.name = me.name;
-#define ENDCLASS(cname)                    me.instanceOf##cname = 1; me.classname = #cname; if(!vtbl##cname) vtbl##cname = spawnVtbl(me, basevtbl); return me; }
+#define ENDCLASS(cname)                    me.instanceOf##cname = 1; me.classname = #cname; if(!cname##_vtbl) cname##_vtbl = spawnVtbl(me, basevtbl); return me; }
 #define SUPER(cname)

diff --git a/qcsrc/menu/oo/implementation.h b/qcsrc/menu/oo/implementation.h
index 1caed113ea8545e94f3f20869f4b8425e85e5bcf..ed6bd71f36087d7527c52fe03cef45388bb03c2b 100644 (file)
--- a/qcsrc/menu/oo/implementation.h
+++ b/qcsrc/menu/oo/implementation.h
@@ -16,4 +16,4 @@
 #undef SUPER
 #endif
 
-#define SUPER(cname) (vtbl##cname.vtblbase)
+#define SUPER(cname) (cname##_vtbl.vtblbase)