From 0d014b40d7753f5ca08bb3c8de6fc0039a3caa08 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sat, 23 Jan 2010 10:04:31 +0000 Subject: [PATCH] cvar switch for globally turning off selfdamage/falldamage in cts (independent from balance cfg #includes) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8532 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 1 + data/qcsrc/server/g_damage.qc | 2 +- data/qcsrc/server/sv_main.qc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 5ffe14c0b..415c2c46c 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -569,6 +569,7 @@ set g_rc_respawn_waves 0 set g_rc_respawn_delay 0 set g_cts_respawn_waves 0 set g_cts_respawn_delay 0 +set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts" // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 707827845..a2895ffa6 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -799,7 +799,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if (targ == attacker) { - if(g_ca) + if(g_ca || (g_cts && !cvar("g_cts_selfdamage"))) damage = 0; else damage = damage * cvar("g_balance_selfdamagepercent"); // Partial damage if the attacker hits himself diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc index e6569ebae..693bdc4e7 100644 --- a/data/qcsrc/server/sv_main.qc +++ b/data/qcsrc/server/sv_main.qc @@ -67,7 +67,7 @@ void CreatureFrame (void) self.dmg = 2; } // check for falling damage - if(!self.hook.state && !g_ca) + if(!self.hook.state && !g_ca && !(g_cts && !cvar("g_cts_selfdamage"))) { dm = vlen(self.oldvelocity) - vlen(self.velocity); // dm is now the velocity DECREASE. Velocity INCREASE should never cause a sound or any damage. if (self.deadflag) -- 2.39.2