X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fdefer.qh;h=5d6473080a60d9b470856efb27fc1344056764c3;hb=bf1d64ebc5c2867b079a0bfa09f448f076d6be01;hp=24764ae1585038b96257e139e857f7f30417dae5;hpb=9e4d4368341089b726b96a2a7f43813975ecc6da;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index 24764ae15..5d6473080 100644
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -1,33 +1,23 @@
 #pragma once
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 	#include "oo.qh"
 	#include "self.qh"
 
 	entityclass(Defer);
-	class(Defer).entity owner;
-	class(Defer).void() think;
-	class(Defer).float nextthink;
-	class(Defer).void(entity) defer_func;
+	classfield(Defer).entity owner;
+	classfield(Defer).void(entity) defer_func;
 
-	/** Remove self */
+	/** Remove entity */
 	void SUB_Remove(entity this)
 	{
-		remove(this);
+		delete(this);
 	}
 
-	/** Remove self */
-	void SUB_Remove_self()
+	void defer_think(entity this)
 	{
-		SELFPARAM();
-		remove(this);
-	}
-
-	void defer_think()
-	{
-		SELFPARAM();
-		this.think     = SUB_Remove_self;
+		setthink(this, SUB_Remove);
 		this.nextthink = time;
 		this.defer_func(this.owner);
 	}
@@ -41,7 +31,7 @@
 		entity e    = new_pure(deferred);
 		e.owner     = this;
 		e.defer_func = func;
-		e.think     = defer_think;
+		setthink(e, defer_think);
 		e.nextthink = time + fdelay;
 	}