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 ed4eba5a12676d430314bd7c46a6d93603405405..894b4b92859f166b9aff791589a2965fd82c76c4 100644 (file)
--- a/qcsrc/menu/oo/base.qh
+++ b/qcsrc/menu/oo/base.qh
@@ -1,27 +1,9 @@
-.string classname;
-entity Object_vtbl;
-.string vtblname;
-.entity vtblbase;
-// THIS LINE INTENTIONALLY LEFT BLANK
-entity spawnVtbl(entity e, entity b)
-{
-       entity v;
-       v = spawn();
-       copyentity(e, v);
-       v.vtblname = v.classname;
-       v.classname = "vtbl";
-       if(b)
-               v.vtblbase = b;
-       else
-               v.vtblbase = v;
-       return v;
-}
-entity spawnObject()
-{
-       entity e;
-       e = spawn();
-       e.classname = "Object";
-       if(!Object_vtbl)
-               Object_vtbl = spawnVtbl(e, null_entity);
-       return e;
-}
+#ifndef BASE_H
+#define BASE_H
+
+#include "../../common/util.qh"
+#include "../../dpdefs/keycodes.qh"
+
+#define world NULL
+
+#endif