From: terencehill <piuntn@gmail.com>
Date: Tue, 27 Nov 2012 23:51:44 +0000 (+0100)
Subject: allowed_to_spawn is used only by the CA code
X-Git-Tag: xonotic-v0.7.0~61^2~109
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e02d886eca94e01afc610529dcbc98ae19a77d0;p=xonotic%2Fxonotic-data.pk3dir.git

allowed_to_spawn is used only by the CA code
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 6a22b1c5f..c7804849d 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -225,16 +225,14 @@ void Arena_Warmup()
 
 	f = ceil(warmup - time);
 
-	if(inWarmupStage)
+	if(inWarmupStage && g_ca)
 		allowed_to_spawn = 1;
-	else if(!g_ca)
-		allowed_to_spawn = 0;
 
 	if(time < warmup && !inWarmupStage)
 	{
 		if (g_ca)
 			allowed_to_spawn = 1;
-		if(champion && g_arena)
+		else if(champion && g_arena)
 		{
 			FOR_EACH_REALCLIENT(e)
 				centerprint(e, strcat("The Champion is ", champion.netname));
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 4cd5cc810..f08ca318f 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -585,8 +585,6 @@ void spawnfunc_worldspawn (void)
 
 	compressShortVector_init();
 
-	allowed_to_spawn = TRUE;
-
 	entity head;
 	head = nextent(world);
 	maxclients = 0;
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index b8f2f3ac8..61b9f06fd 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -181,6 +181,7 @@ void InitGameplayMode()
 		ActivateTeamplay();
 		fraglimit_override = autocvar_g_ca_point_limit;
 		leadlimit_override = autocvar_g_ca_point_leadlimit;
+		allowed_to_spawn = TRUE;
 		precache_sound("ctf/red_capture.wav");
 		precache_sound("ctf/blue_capture.wav");
 	}