Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / gravity.qc

diff --git a/qcsrc/common/triggers/trigger/gravity.qc b/qcsrc/common/triggers/trigger/gravity.qc
index 659a336901e26665bb0ce56e14e1ee04327a252f..c7dd586cb3b3f266435bed42dd0a458be6511d7e 100644 (file)
--- a/qcsrc/common/triggers/trigger/gravity.qc
+++ b/qcsrc/common/triggers/trigger/gravity.qc
@@ -32,9 +32,9 @@ void trigger_gravity_check_think()
        }
 }
 
-void trigger_gravity_use()
-{SELFPARAM();
-       self.state = !self.state;
+void trigger_gravity_use(entity this, entity actor, entity trigger)
+{
+       this.state = !this.state;
 }
 
 void trigger_gravity_touch()
@@ -80,13 +80,13 @@ void trigger_gravity_touch()
        {
                other.gravity = g;
                if(self.noise != "")
-                       sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM);
+                       _sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM);
                UpdateCSQCProjectile(self.owner);
        }
 }
 
-void spawnfunc_trigger_gravity()
-{SELFPARAM();
+spawnfunc(trigger_gravity)
+{
        if(self.gravity == 1)
                return;