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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Dec 22 05:21:29 EST 2009


Author: div0
Date: 2009-12-22 05:21:28 -0500 (Tue, 22 Dec 2009)
New Revision: 8446

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
more minsta fixes


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-12-21 12:48:47 UTC (rev 8445)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-12-22 10:21:28 UTC (rev 8446)
@@ -739,12 +739,13 @@
 				(deathtype == DEATH_DROWN) ||
 				(deathtype == DEATH_SLIME) ||
 				(deathtype == DEATH_LAVA)  ||
-				(damage < 100))
+				(!DEATH_ISWEAPON(deathtype, WEP_LASER) && damage > 0 && damage < 100))
 			{
 				self = oldself;
 				return;
 			}
-			damage = 10000;
+			if(damage > 0)
+			    damage = 10000;
 			if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage)
 			{
 				targ.armorvalue -= 1;



More information about the nexuiz-commits mailing list