X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=ae64e74e4909d66882ea09e261926086977b4da0;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hp=d060d2cca859590ce3ee92e1966daca1f1464e83;hpb=8f08a117d2eada0c38cb1d07a0798daf192dd666;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index d060d2cca..ae64e74e4 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -1,26 +1,28 @@ #include "round_handler.qh" +#include +#include +#include "campaign.qh" #include "command/vote.qh" #include "../common/util.qh" void round_handler_Think(entity this) { - if (time < game_starttime) + if (intermission_running) { - round_handler_Reset(game_starttime); + round_handler_Reset(0); + round_handler_Remove(); return; } - if (gameover) - gameover = false; - - if (intermission_running) + if (time < game_starttime) { - round_handler_Reset(0); - round_handler_Remove(); + round_handler_Reset(game_starttime); return; } + game_stopped = false; + if (this.wait) { this.wait = false; @@ -31,7 +33,7 @@ void round_handler_Think(entity this) if (this.cnt > 0) // countdown running { - if (this.canRoundStart()) + if (this.canRoundStart() && !(autocvar_g_campaign && !campaign_bots_may_start)) { if (this.cnt == this.count + 1) round_starttime = time + this.count; int f = this.cnt - 1; @@ -58,7 +60,6 @@ void round_handler_Think(entity this) // schedule a new round this.wait = true; this.nextthink = time + this.delay; - gameover = true; } else { @@ -77,7 +78,7 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli } // NOTE: this is only needed because if round_handler spawns at time 1 -// gamestarttime isn't initialized yet +// game_starttime isn't initialized yet void round_handler_FirstThink(entity this) { round_starttime = max(time, game_starttime) + this.count;