r4012 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-04 03:37:03 -0400 (Mon, 04 Aug 2008)
New Revision: 4012

Modified:
   trunk/data/qcsrc/server/cl_player.qc
Log:
actually, better play the pain sound if the next TWO laser jumps would kill you


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-08-04 07:35:59 UTC (rev 4011)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-08-04 07:37:03 UTC (rev 4012)
@@ -409,8 +409,8 @@
 					else
 						player_setanim(self.anim_pain2, FALSE, TRUE, TRUE);
 
-					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(deathtype != IT_LASER || attacker != self || self.health < 2 * 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 two
 					{
 						if(self.health > 75) // TODO make a "gentle" version?
 							PlayerSound(playersound_pain100, 0);