Fix up more mutator hooks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_assault.qc

diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc
index ca1779486c973097e9de6d2e676fd4e20f22a579..a377d0368d607a6fa5040d6a0366396a335303dc 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_assault.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc
@@ -625,9 +625,11 @@ MUTATOR_HOOKFUNCTION(as, PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(as, TurretSpawn)
-{SELFPARAM();
-       if(!self.team || self.team == MAX_SHOT_DISTANCE)
-               self.team = 5; // this gets reversed when match starts?
+{
+       entity turret = M_ARGV(0, entity);
+
+       if(!turret.team || turret.team == MAX_SHOT_DISTANCE)
+               turret.team = 5; // this gets reversed when match starts?
 
        return false;
 }
@@ -674,8 +676,9 @@ MUTATOR_HOOKFUNCTION(as, ReadLevelCvars)
 
 MUTATOR_HOOKFUNCTION(as, OnEntityPreSpawn)
 {
-    SELFPARAM();
-       switch(self.classname)
+    entity ent = M_ARGV(0, entity);
+
+       switch(ent.classname)
        {
                case "info_player_team1":
                case "info_player_team2":