Merge branch 'TimePath/killself' into 'master'

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

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index d56895dcae4e4ab76f7c6947690e5a6bcf6db872..d4a25089fc5a2bf88eddee18ccb51a91e6e85830 100644 (file)
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -15,17 +15,9 @@
                remove(this);
        }
 
-       /** Remove self */
-       void SUB_Remove_self()
-       {
-               SELFPARAM();
-               remove(this);
-       }
-
-       void defer_think()
+       void defer_think(entity this)
        {
-               SELFPARAM();
-               setthink(this, SUB_Remove_self);
+               setthink(this, SUB_Remove);
                this.nextthink = time;
                this.defer_func(this.owner);
        }