Merge branch 'terencehill/v_deathtilt_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_subs.qc

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index a2cbc5a431e4d2fd9ad6bb3ed462ac9d4c5dffc5..cc4d2c60d69da5900d4b87113aa9f75fbdb459d3 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -8,7 +8,7 @@
 
 spawnfunc(info_null)
 {
-       remove(self);
+       remove(this);
        // if anything breaks, tell the mapper to fix his map! info_null is meant to remove itself immediately.
 }
 
@@ -434,17 +434,17 @@ void InitSolidBSPTrigger()
        self.model = "";
 }
 
-float InitMovingBrushTrigger()
-{SELFPARAM();
+bool InitMovingBrushTrigger(entity this)
+{
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-       self.solid = SOLID_BSP;
-       SetBrushEntityModel();
-       self.movetype = MOVETYPE_PUSH;
-       if(self.modelindex == 0)
+       this.solid = SOLID_BSP;
+       WITHSELF(this, SetBrushEntityModel());
+       this.movetype = MOVETYPE_PUSH;
+       if(this.modelindex == 0)
        {
                objerror("InitMovingBrushTrigger: no brushes found!");
-               return 0;
+               return false;
        }
-       return 1;
+       return true;
 }