From c414b7f0f3e2297640d07576e5cc258bc22e756b Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 24 May 2011 19:45:29 -0400 Subject: [PATCH] Add checks for other.deadflag when announcing airshot -- this way airshots don't happen when the player is dead. --- qcsrc/server/w_grenadelauncher.qc | 5 +++-- qcsrc/server/w_minelayer.qc | 5 +++-- qcsrc/server/w_rocketlauncher.qc | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 017a41a87..02ba362ae 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -30,8 +30,9 @@ void W_Grenade_Explode2 (void) if(other.takedamage == DAMAGE_AIM) if(other.classname == "player") if(IsDifferentTeam(self.owner, other)) - if(IsFlying(other)) - AnnounceTo(self.owner, "airshot"); + if(other.deadflag == DEAD_NO) + if(IsFlying(other)) + AnnounceTo(self.owner, "airshot"); self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 14c6506fa..8c3186d15 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -56,8 +56,9 @@ void W_Mine_Explode () if(other.takedamage == DAMAGE_AIM) if(other.classname == "player") if(IsDifferentTeam(self.owner, other)) - if(IsFlying(other)) - AnnounceTo(self.owner, "airshot"); + if(other.deadflag == DEAD_NO) + if(IsFlying(other)) + AnnounceTo(self.owner, "airshot"); self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index dfd2c3f19..23ebee65d 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -21,8 +21,9 @@ void W_Rocket_Explode () if(other.takedamage == DAMAGE_AIM) if(other.classname == "player") if(IsDifferentTeam(self.owner, other)) - if(IsFlying(other)) - AnnounceTo(self.owner, "airshot"); + if(other.deadflag == DEAD_NO) + if(IsFlying(other)) + AnnounceTo(self.owner, "airshot"); self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; -- 2.39.2