Use SELFPARAM() in every function that uses self

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

diff --git a/qcsrc/lib/Defer.qh b/qcsrc/lib/Defer.qh
index fd2619d6fb0be4b93ac667d490551bd483297fd2..ce12478b57cb8832a12abb4b842eaae3232726c8 100644 (file)
--- a/qcsrc/lib/Defer.qh
+++ b/qcsrc/lib/Defer.qh
@@ -16,20 +16,16 @@ Remove self
 ==================
 */
 void SUB_Remove()
-{
+{SELFPARAM();
        remove (self);
 }
 
 void defer_think()
-{
-    entity oself;
-
-    oself           = self;
-    self            = self.owner;
-    oself.think     = SUB_Remove;
-    oself.nextthink = time;
-
-    oself.use();
+{SELFPARAM();
+    self.think     = SUB_Remove;
+    self.nextthink = time;
+    SELFCALL(self.owner, self.use());
+    SELFCALL_DONE();
 }
 
 /*
@@ -37,7 +33,7 @@ void defer_think()
     self when func is executed = self when defer is called
 */
 void defer(float fdelay, void() func)
-{
+{SELFPARAM();
     entity e;
 
     e           = spawn();