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 6c495663452c2a0dffe4bf001b450c2c8a01498f..3e7e020c67a5fea2ea7368fb3444a30f9fbebea2 100644 (file)
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -1,48 +1,38 @@
-#ifndef MENUQC
-#ifndef DEFER_H
-#define DEFER_H
-
-#include "oo.qh"
-#include "self.qh"
-
-entityclass(Defer);
-class(Defer) .entity owner;
-class(Defer) .void() think;
-class(Defer) .float nextthink;
-
-/*
-==================
-SUB_Remove
+#pragma once
 
-Remove self
-==================
-*/
-void SUB_Remove()
-{SELFPARAM();
-       remove (self);
-}
-
-void defer_think()
-{SELFPARAM();
-    self.think     = SUB_Remove;
-    self.nextthink = time;
-    WITH(entity, self, self.owner, self.use());
-}
-
-/*
-    Execute func() after time + fdelay.
-    self when func is executed = self when defer is called
-*/
-void defer(float fdelay, void() func)
-{SELFPARAM();
-    entity e;
+#ifndef MENUQC
 
-    e           = spawn();
-    e.owner     = self;
-    e.use       = func;
-    e.think     = defer_think;
-    e.nextthink = time + fdelay;
-}
+       #include "oo.qh"
+       #include "self.qh"
+
+       entityclass(Defer);
+       class(Defer).entity owner;
+       class(Defer).void(entity) defer_func;
+
+       /** Remove entity */
+       void SUB_Remove(entity this)
+       {
+               remove(this);
+       }
+
+       void defer_think(entity this)
+       {
+               setthink(this, SUB_Remove);
+               this.nextthink = time;
+               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) func)
+       {
+               entity e    = new_pure(deferred);
+               e.owner     = this;
+               e.defer_func = func;
+               setthink(e, defer_think);
+               e.nextthink = time + fdelay;
+       }
 
 #endif
-#endif