Weapons: remove many direct references to `self`

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

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 69c9fffd793116502e0127cf7be6679ad5c62172..954b498d5ccf8adc645ebc3df442f4cb384d1da1 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -3,7 +3,7 @@
 
 #include "mutator.qh"
 
-void W_Blaster_Attack(float, float, float, float, float, float, float, float, float, float);
+void W_Blaster_Attack(entity, float, float, float, float, float, float, float, float, float, float);
 void spawnfunc_weapon_hmg();
 void spawnfunc_weapon_rpc();
 
@@ -149,6 +149,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
                int oldwep = self.weapon;
                self.weapon = WEP_BLASTER.m_id;
                W_Blaster_Attack(
+                       self,
                        WEP_BLASTER.m_id | HITTYPE_SECONDARY,
                        WEP_CVAR_SEC(vaporizer, shotangle),
                        WEP_CVAR_SEC(vaporizer, damage),
@@ -178,7 +179,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
                }
                Weapon wpn = get_weaponinfo(self.weapon);
                if(self.weaponentity.state != WS_CLEAR)
-                       w_ready(wpn, self.BUTTON_ATCK, self.BUTTON_ATCK2);
+                       w_ready(wpn, self, self.BUTTON_ATCK, self.BUTTON_ATCK2);
 
                self.weapon_blocked = true;
        }