Merge remote-tracking branch 'origin/samual/serverlist'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / oo / base.h

diff --git a/qcsrc/menu/oo/base.h b/qcsrc/menu/oo/base.h
index 2a413a6937bc33786b1c4dd90db1c4df5a4ba2bd..ed4eba5a12676d430314bd7c46a6d93603405405 100644 (file)
--- a/qcsrc/menu/oo/base.h
+++ b/qcsrc/menu/oo/base.h
@@ -1,7 +1,8 @@
 .string classname;
-entity vtblObject;
+entity Object_vtbl;
 .string vtblname;
 .entity vtblbase;
+// THIS LINE INTENTIONALLY LEFT BLANK
 entity spawnVtbl(entity e, entity b)
 {
        entity v;
@@ -20,7 +21,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;
 }