From: FruitieX Date: Sat, 23 Oct 2010 15:11:10 +0000 (+0300) Subject: set allowed_to_spawn = TRUE as early as we can, this way bots already connected after... X-Git-Tag: xonotic-v0.1.0preview~245^2~8^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ac2ef27d3c81a6eb185fed25180f46aaa7ba2c1;p=xonotic%2Fxonotic-data.pk3dir.git set allowed_to_spawn = TRUE as early as we can, this way bots already connected after mapchange seem to actually spawn --- diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index 4a3d51449..a11e01d06 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -10,7 +10,6 @@ entity spawnqueue_last; entity champion; string champion_name; float warmup; -float allowed_to_spawn; float ca_players; float required_ca_players; .float caplayer; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d1d86ed79..745a6e0b2 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -651,3 +651,5 @@ string deathmessage; .entity realowner; .float nex_charge; + +float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 08329a29d..510e2c1b7 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -440,6 +440,8 @@ void spawnfunc_worldspawn (void) compressShortVector_init(); + allowed_to_spawn = TRUE; + local entity head; head = nextent(world); maxclients = 0;