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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-22 02:23:00 -0400 (Fri, 22 May 2009)
New Revision: 6751

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/maps/basement.bsp
   trunk/data/maps/strength.bsp
   trunk/data/qcsrc/server/teamplay.qc
Log:
add a g_tdm_teams_override cvar similar to g_keyhunt_teams_override


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-05-22 02:31:28 UTC (rev 6750)
+++ trunk/data/defaultNexuiz.cfg	2009-05-22 06:23:00 UTC (rev 6751)
@@ -505,7 +505,8 @@
 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"
 seta g_balance_teams_prevent_imbalance	0	"prevent players from changing to larger teams"
-seta g_tdm_teams 2	"how many teams are in team deathmatch"
+set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)"
+seta g_tdm_teams_override 0	"how many teams are in team deathmatch"
 set g_changeteam_banned 0	"not allowed to change team"
 set g_changeteam_fragtransfer 0	"% of frags you get to keep when you change teams (rounded down)"
 

Modified: trunk/data/maps/basement.bsp
===================================================================
(Binary files differ)

Modified: trunk/data/maps/strength.bsp
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-05-22 02:31:28 UTC (rev 6750)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-05-22 06:23:00 UTC (rev 6751)
@@ -587,9 +587,7 @@
 		else if(g_race)
 			dm = race_teams;
 		else
-			dm = cvar("g_tdm_teams");
-		if(dm < 2)
-			error("g_tdm_teams < 2, not enough teams to play team deathmatch\n");
+			dm = 2;
 
 		if(dm >= 4)
 		{
@@ -1289,7 +1287,10 @@
 {
 	float numteams;
 
-	numteams = cvar("g_tdm_teams");
+	numteams = cvar("g_tdm_teams_override");
+	if(numteams < 2)
+		numteams = cvar("g_tdm_teams");
+	numteams = bound(2, numteams, 4);
 
 	tdm_spawnteam("Red", COLOR_TEAM1-1);
 	tdm_spawnteam("Blue", COLOR_TEAM2-1);