From 06fef2ca9f98584260282757555ca11c872cf01d Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 29 Aug 2006 06:15:25 +0000 Subject: [PATCH] restored "teamplay 2" for compatibility, "teamplay 4" now enabled the mode with mirror damage and configurable friendly fire git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1867 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 10 ++++++++-- data/qcsrc/server/g_damage.qc | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index f99af07a1..d2d4b2961 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -250,9 +250,15 @@ seta timelimit_maxovertime 5 // common team values set g_tdm 0 + seta teamplay_default 3 // default teamplay setting in team games -seta g_mirrordamage 0.0 // for teamplay 2: mirror damage factor -seta g_friendlyfire 1.0 // for teamplay 2: fiendly fire factor + // 1 = no friendly fire, self damage + // 2 = friendly fire and self damage enabled + // 3 = no friendly fire, but self damage enabled + // 4 = obey the following two cvars +seta g_mirrordamage 0.0 // for teamplay 4: mirror damage factor +seta g_friendlyfire 1.0 // for teamplay 4: fiendly fire factor + set deathmatch_force_teamplay 0 // always play TDM on dm maps seta g_balance_teams 0 // automatically balance out players entering instead of asking them for their preferred team seta g_balance_teams_force 0 // automatically balance out teams when players move or disconnect diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 70bb51f94..d34480393 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -352,7 +352,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(attacker.team) if(attacker.team == targ.team) damage = 0; - if(teamplay == 2) + if(teamplay == 4) if(attacker != targ) if(attacker.team == targ.team) if(attacker.classname == "player") -- 2.39.2