r1873 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-08-30 02:33:16 -0400 (Wed, 30 Aug 2006)
New Revision: 1873

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
now handling MinstaGib laser correctly in mirror damage


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2006-08-30 06:13:52 UTC (rev 1872)
+++ trunk/data/qcsrc/server/g_damage.qc	2006-08-30 06:33:16 UTC (rev 1873)
@@ -360,7 +360,13 @@
 					{
 						mirrordamage = cvar("g_mirrordamage") * damage;
 						mirrorforce = cvar("g_mirrordamage") * vlen(force);
-						damage = cvar("g_friendlyfire") * damage;
+						if(cvar("g_minstagib"))
+						{
+							if(cvar("g_friendlyfire") == 0)
+								damage = 0;
+						}
+						else
+							damage = cvar("g_friendlyfire") * damage;
 						// mirrordamage will be used LATER
 					}
 
@@ -408,7 +414,9 @@
 				if (targ.classname == "player")
 					centermsg_setfor(attacker, CENTERMSG_MINSTAGIB, "Secondary fire inflicts no damage!\n");
 				damage = 0;
+				mirrordamage = 0;
 				force = '0 0 0';
+				// keep mirrorforce
 				attacker = targ;
 			}
 		}