[nexuiz-commits] r8279 - in trunk/data: maps qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-11-14 15:28:58 -0500 (Sat, 14 Nov 2009)
New Revision: 8279

Modified:
   trunk/data/maps/silvercity.mapinfo
   trunk/data/qcsrc/server/g_damage.qc
Log:
fix friendlyfire check in ca, add ca support for silvercity


Modified: trunk/data/maps/silvercity.mapinfo
===================================================================
--- trunk/data/maps/silvercity.mapinfo	2009-11-14 20:09:56 UTC (rev 8278)
+++ trunk/data/maps/silvercity.mapinfo	2009-11-14 20:28:58 UTC (rev 8279)
@@ -10,4 +10,5 @@
 type rune 200 20
 type lms 9 20
 type kh 1000 20 3
+type ca 10 20
 cdtrack 10

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-11-14 20:09:56 UTC (rev 8278)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-11-14 20:28:58 UTC (rev 8279)
@@ -710,7 +710,9 @@
 								if(cvar("g_friendlyfire") == 0)
 									damage = 0;
 							}
-							else if(!g_ca)
+							else if(g_ca)
+								damage = 0;
+							else
 								damage = cvar("g_friendlyfire") * damage;
 							// mirrordamage will be used LATER
 						}