X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Foo.qh;h=3708552d5968c5d5bcfb1c976bd56cae9779fa63;hb=8cbf0e84432e075e617f43c037c645ea9846eba0;hp=e1e3193308c4a0fe021301445e827dedd97a4ec8;hpb=aa3e381de9834f9ae1fcf1585ab65dc6fa22d89e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/oo.qh b/qcsrc/lib/oo.qh
index e1e319330..3708552d5 100644
--- a/qcsrc/lib/oo.qh
+++ b/qcsrc/lib/oo.qh
@@ -4,13 +4,6 @@
 #include "nil.qh"
 #include "static.qh"
 
-#ifdef MENUQC
-	#define NULL (0, null_entity)
-	#define world NULL
-#else
-	#define NULL (0, world)
-#endif
-
 .vector origin;
 .bool pure_data;
 /** @deprecated use new_pure or NEW(class) */
@@ -50,10 +43,10 @@ entity __spawn(string _classname, string _sourceLoc, bool pure)
 	if (pure) {
 		make_pure(this);
 		#ifdef CSQC
-		setorigin(this, '0 0 10000');
+		setorigin(this, (world.mins + world.maxs) * 0.5);
 		#endif
 		#ifdef SVQC
-        setorigin(this, '0 0 -10000');
+        setorigin(this, (world.mins + world.maxs) * 0.5);
         #endif
 	}
 	return this;