r1867 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-08-29 02:15:25 -0400 (Tue, 29 Aug 2006)
New Revision: 1867

Modified:
   trunk/data/default.cfg
   trunk/data/qcsrc/server/g_damage.qc
Log:
restored "teamplay 2" for compatibility, "teamplay 4" now enabled the mode with mirror damage and configurable friendly fire


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2006-08-28 23:01:54 UTC (rev 1866)
+++ trunk/data/default.cfg	2006-08-29 06:15:25 UTC (rev 1867)
@@ -250,9 +250,15 @@
 
 // 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

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2006-08-28 23:01:54 UTC (rev 1866)
+++ trunk/data/qcsrc/server/g_damage.qc	2006-08-29 06:15:25 UTC (rev 1867)
@@ -352,7 +352,7 @@
 			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")