r4011 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-04 03:35:59 -0400 (Mon, 04 Aug 2008)
New Revision: 4011

Modified:
   trunk/data/qcsrc/server/cl_player.qc
Log:
exclude pain sounds for laserjumps as long as you aren't REALLY low on health and would die of the next one


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-08-04 07:27:38 UTC (rev 4010)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-08-04 07:35:59 UTC (rev 4011)
@@ -409,14 +409,18 @@
 					else
 						player_setanim(self.anim_pain2, FALSE, TRUE, TRUE);
 
-					if(self.health > 75) // TODO make a "gentle" version?
-						PlayerSound(playersound_pain100, 0);
-					else if(self.health > 50)
-						PlayerSound(playersound_pain75, 0);
-					else if(self.health > 25)
-						PlayerSound(playersound_pain50, 0);
-					else if(self.health > 1)
-						PlayerSound(playersound_pain25, 0);
+					if(deathtype != IT_LASER || attacker != self || self.health < cvar("g_balance_laser_primary_damage") * cvar("g_balance_selfdamagepercent") + 1)
+					// exclude pain sounds for laserjumps as long as you aren't REALLY low on health and would die of the next one
+					{
+						if(self.health > 75) // TODO make a "gentle" version?
+							PlayerSound(playersound_pain100, 0);
+						else if(self.health > 50)
+							PlayerSound(playersound_pain75, 0);
+						else if(self.health > 25)
+							PlayerSound(playersound_pain50, 0);
+						else if(self.health > 1)
+							PlayerSound(playersound_pain25, 0);
+					}
 				}
 
 				// throw off bot aim temporarily