Step 5: complete

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / defer.qh

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index d4c1eadac75db7a4dbbd87a738892b7e0f039565..3e7e020c67a5fea2ea7368fb3444a30f9fbebea2 100644 (file)
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -7,40 +7,31 @@
 
        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;
-               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;
        }