From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 07:14:23 +0000 (+0200)
Subject: also rename vtblClass to Class_vtbl
X-Git-Tag: xonotic-v0.1.0preview~541^2~23^2^2~2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=6bb2703ad96100f0957731564733f66a79f93c31;p=xonotic%2Fxonotic-data.pk3dir.git

also rename vtblClass to Class_vtbl
---

diff --git a/qcsrc/menu/oo/base.h b/qcsrc/menu/oo/base.h
index 2a413a693..3553d447a 100644
--- 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 f84d13311..85bc6c2af 100644
--- 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 5533c8ce8..4e758dd47 100644
--- 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 1caed113e..ed6bd71f3 100644
--- 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)