Merge branch 'master' into terencehill/dynamic_hud

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

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index 56014121f8936bf128492fcb0a4ac5e35c0754eb..24764ae1585038b96257e139e857f7f30417dae5 100644 (file)
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -9,6 +9,7 @@
        class(Defer).entity owner;
        class(Defer).void() think;
        class(Defer).float nextthink;
+       class(Defer).void(entity) defer_func;
 
        /** Remove self */
        void SUB_Remove(entity this)
@@ -28,18 +29,18 @@
                SELFPARAM();
                this.think     = SUB_Remove_self;
                this.nextthink = time;
-               WITHSELF(this.owner, this.use());
+               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() func)
+    /**
+     * Execute func() after time + fdelay.
+     * self when func is executed = self when defer is called
+     */
+       void defer(entity this, float fdelay, void(entity) func)
        {
                entity e    = new_pure(deferred);
                e.owner     = this;
-               e.use       = func;
+               e.defer_func = func;
                e.think     = defer_think;
                e.nextthink = time + fdelay;
        }