Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/menu/oo/base.qh b/qcsrc/menu/oo/base.qh
index a8337501be68c5d77b007bc6da7e2441aa87b377..894b4b92859f166b9aff791589a2965fd82c76c4 100644 (file)
--- a/qcsrc/menu/oo/base.qh
+++ b/qcsrc/menu/oo/base.qh
@@ -1,28 +1,9 @@
 #ifndef BASE_H
 #define BASE_H
 
-.string classname;
-.string vtblname;
-.entity vtblbase;
-entity spawnVtbl(entity this, entity base)
-{
-       entity vtbl = spawn();
-       copyentity(this, vtbl);
-       vtbl.vtblname = vtbl.classname;
-       vtbl.classname = "vtbl";
-       vtbl.vtblbase = base ? base : vtbl; // Top level objects use vtbl as base
-       return vtbl;
-}
+#include "../../common/util.qh"
+#include "../../dpdefs/keycodes.qh"
 
-entity Object_vtbl;
-entity spawnObject(entity this, entity)
-{
-       this = spawn();
-       this.classname = "Object";
-       if (!Object_vtbl) Object_vtbl = spawnVtbl(this, null_entity);
-       return this;
-}
-
-#define NEW(cname) (spawn##cname(null_entity, null_entity))
+#define world NULL
 
 #endif