[nexuiz-commits] r8428 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-19 14:49:22 -0500 (Sat, 19 Dec 2009)
New Revision: 8428

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/g_damage.qc
Log:
quick fix for hurt triggers in minstagib


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-12-19 19:38:00 UTC (rev 8427)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-12-19 19:49:22 UTC (rev 8428)
@@ -1420,4 +1420,4 @@
 		sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: You have been moved to the ", Team_ColorNameLowerCase(team_colour), " team\n"));  // send a chat message
 
 	bprint(strcat(client.netname, " joined the ", ColoredTeamName(client.team), "\n"));
-}
\ No newline at end of file
+}

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-12-19 19:38:00 UTC (rev 8427)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-12-19 19:49:22 UTC (rev 8428)
@@ -738,11 +738,13 @@
 			if ((deathtype == DEATH_FALL)  ||
 				(deathtype == DEATH_DROWN) ||
 				(deathtype == DEATH_SLIME) ||
-				(deathtype == DEATH_LAVA))
+				(deathtype == DEATH_LAVA)  ||
+				(damage < 100))
 			{
 				self = oldself;
 				return;
 			}
+			damage = 10000;
 			if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage)
 			{
 				targ.armorvalue -= 1;