X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fdefer.qh;h=4f34bb4853ade7f0149274ebdb3c325d4468147a;hb=94e238ca164301485d7935e8b84aaabe8aa8653a;hp=d4c1eadac75db7a4dbbd87a738892b7e0f039565;hpb=d271f27a5ac351a3a7b39636932f6d661492be1d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index d4c1eadac..4f34bb485 100644
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -1,46 +1,37 @@
 #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;
 
-	/** 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;
-		WITHSELF(this.owner, this.selfthink(this));
+		this.defer_func(this.owner);
 	}
 
     /**
      * Execute func() after time + fdelay.
      * self when func is executed = self when defer is called
      */
-	void defer(entity this, float fdelay, void(entity this) func)
+	void defer(entity this, float fdelay, void(entity) func)
 	{
 		entity e    = new_pure(deferred);
 		e.owner     = this;
-		setthink(e, func);
-		e.think     = defer_think;
+		e.defer_func = func;
+		setthink(e, defer_think);
 		e.nextthink = time + fdelay;
 	}