[nexuiz-commits] r8193 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 30 15:24:13 EDT 2009
Author: div0
Date: 2009-10-30 15:24:12 -0400 (Fri, 30 Oct 2009)
New Revision: 8193
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
TDM: g_tdm_team_spawns
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/defaultNexuiz.cfg 2009-10-30 19:24:12 UTC (rev 8193)
@@ -555,6 +555,7 @@
seta g_balance_teams_prevent_imbalance 0 "prevent players from changing to larger teams"
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_tdm_team_spawns 0 "when 1, a map can define team spawnpoints for TDM"
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/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-10-30 19:24:12 UTC (rev 8193)
@@ -92,7 +92,7 @@
void spawnpoint_use()
{
if(teams_matter)
- if(have_team_spawns)
+ if(have_team_spawns > 0)
{
self.team = activator.team;
some_spawn_has_been_used = 1;
@@ -293,7 +293,7 @@
teamcheck = 0;
- if(!anypoint && have_team_spawns)
+ if(!anypoint && have_team_spawns > 0)
teamcheck = self.team;
// get the list of players
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/qcsrc/server/defs.qh 2009-10-30 19:24:12 UTC (rev 8193)
@@ -418,7 +418,7 @@
.float team_saved;
float some_spawn_has_been_used;
-float have_team_spawns;
+float have_team_spawns; // 0 = no team spawns requested, -1 = team spawns requested but none found, 1 = team spawns requested and found
// set when showing a kill countdown
.entity killindicator;
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/qcsrc/server/g_world.qc 2009-10-30 19:24:12 UTC (rev 8193)
@@ -1776,7 +1776,7 @@
{
entity head;
- if(!have_team_spawns)
+ if(have_team_spawns <= 0)
return WINNING_NO;
if(!some_spawn_has_been_used)
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-10-30 19:24:12 UTC (rev 8193)
@@ -263,7 +263,7 @@
if (!self.cnt)
self.cnt = 1;
- if (g_ctf || g_assault || g_onslaught || g_domination || g_nexball)
+ if (have_team_spawns != 0)
if (self.team)
have_team_spawns = 1;
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2009-10-30 18:32:42 UTC (rev 8192)
+++ trunk/data/qcsrc/server/teamplay.qc 2009-10-30 19:24:12 UTC (rev 8193)
@@ -219,6 +219,8 @@
gamemode_name = "Team Deathmatch";
ActivateTeamplay();
tdm_init();
+ if(cvar("g_tdm_team_spawns"))
+ have_team_spawns = -1; // request team spawns
}
if(g_domination)
@@ -229,6 +231,7 @@
fraglimit_override = cvar("g_domination_point_limit");
leadlimit_override = cvar("g_domination_point_leadlimit");
dom_init();
+ have_team_spawns = -1; // request team spawns
}
if(g_ctf)
@@ -252,6 +255,7 @@
leadlimit_override = cvar("captureleadlimit_override");
}
ctf_init();
+ have_team_spawns = -1; // request team spawns
}
if(g_runematch)
@@ -306,6 +310,7 @@
gamemode_name = "Assault";
ActivateTeamplay();
ScoreRules_assault();
+ have_team_spawns = -1; // request team spawns
}
if(g_onslaught)
@@ -313,6 +318,7 @@
game = GAME_ONSLAUGHT;
gamemode_name = "Onslaught";
ActivateTeamplay();
+ have_team_spawns = -1; // request team spawns
}
if(g_race)
@@ -324,6 +330,7 @@
{
ActivateTeamplay();
race_teams = bound(2, cvar("g_race_teams"), 4);
+ have_team_spawns = -1; // request team spawns
}
else
race_teams = 0;
@@ -350,6 +357,7 @@
leadlimit_override = cvar("g_nexball_goalleadlimit");
ActivateTeamplay();
nb_init();
+ have_team_spawns = -1; // request team spawns
}
if(teams_matter)
More information about the nexuiz-commits
mailing list