From 2ceae80748ed6fdcc9b63beab840373f77645d31 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Nov 2014 14:43:06 +1100 Subject: [PATCH] Fix vaporizer secondary causing player hurt sounds, fix impact effects in the sky --- qcsrc/client/damage.qc | 2 +- qcsrc/server/cl_player.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index 32849c2ac..64e12620d 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -345,6 +345,6 @@ void Ent_DamageInfo(float isNew) w_backoff = -1 * normalize(force); setorigin(self, w_org + w_backoff * 2); // for sound() calls - WEP_ACTION(hitwep, WR_IMPACTEFFECT); + if(!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)) { WEP_ACTION(hitwep, WR_IMPACTEFFECT); } } } diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 6fa60f968..42863d61b 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -431,7 +431,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht } if(sound_allowed(MSG_BROADCAST, attacker)) - if(!DEATH_ISWEAPON(deathtype, WEP_BLASTER) || attacker != self || self.health < 2 * WEP_CVAR_PRI(blaster, damage) * autocvar_g_balance_selfdamagepercent + 1) // WEAPONTODO: create separate limit for pain notification with laser + if((self.health < 2 * WEP_CVAR_PRI(blaster, damage) * autocvar_g_balance_selfdamagepercent + 1) || !((get_weaponinfo(DEATH_WEAPONOF(deathtype))).spawnflags & WEP_FLAG_CANCLIMB) || attacker != self) // WEAPONTODO: create separate limit for pain notification with laser if(self.health > 1) // exclude pain sounds for laserjumps as long as you aren't REALLY low on health and would die of the next two { -- 2.39.2