From 9e4d4368341089b726b96a2a7f43813975ecc6da Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 15 Apr 2016 11:52:58 +1000 Subject: [PATCH] Fix defer --- qcsrc/lib/defer.qh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh index d4c1eadac..24764ae15 100644 --- 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.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.defer_func = func; e.think = defer_think; e.nextthink = time + fdelay; } -- 2.39.2