From 1a25c45561d6c60b89a9c284144af0a87547189e Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sat, 14 Nov 2009 20:28:58 +0000 Subject: [PATCH] fix friendlyfire check in ca, add ca support for silvercity git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8279 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/silvercity.mapinfo | 1 + data/qcsrc/server/g_damage.qc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/maps/silvercity.mapinfo b/data/maps/silvercity.mapinfo index bca79ecf6..79262e6af 100644 --- a/data/maps/silvercity.mapinfo +++ b/data/maps/silvercity.mapinfo @@ -10,4 +10,5 @@ type dom 200 20 type rune 200 20 type lms 9 20 type kh 1000 20 3 +type ca 10 20 cdtrack 10 diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 3092d7d72..9d43a5160 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -710,7 +710,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float 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 } -- 2.39.2