allowed_to_spawn is used only by the CA code

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 6a22b1c5f0091b036d55909aa014c59e2e064f71..c7804849d49613cc59c43a56ac5d0e7f07a9680a 100644 (file)
--- 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 4cd5cc810a1c9f456bc372c0e8106e9b2d274488..f08ca318f23c4253838fe0526b69e761d36ad7fc 100644 (file)
--- 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 b8f2f3ac8746ea4e02daae0936833d2086954699..61b9f06fdc5064127c14e19d5c408ac3adcaad6b 100644 (file)
--- 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");
        }