X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fdefer.qh;h=3e7e020c67a5fea2ea7368fb3444a30f9fbebea2;hb=fd94897955a07d2294cb5d5c13d1a7ef2991f711;hp=24764ae1585038b96257e139e857f7f30417dae5;hpb=2a38620bbb43f7b62bbd93e8c22b6abbe627ca86;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index 24764ae15..3e7e020c6 100644
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -7,27 +7,17 @@
 
 	entityclass(Defer);
 	class(Defer).entity owner;
-	class(Defer).void() think;
-	class(Defer).float nextthink;
 	class(Defer).void(entity) defer_func;
 
-	/** Remove self */
+	/** Remove entity */
 	void SUB_Remove(entity this)
 	{
 		remove(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;
 	}