#include "round_handler.qh"
-#include "command/vote.qh"
-#include "../common/util.qh"
+#include <common/mapobjects/triggers.qh>
+#include <common/util.qh>
+#include <server/campaign.qh>
+#include <server/command/vote.qh>
+#include <server/world.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)
+ 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;
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;
}
// 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;
this.nextthink = max(time, game_starttime);
}
-void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, void() roundStart_func)
+void round_handler_Spawn(bool() canRoundStart_func, bool() canRoundEnd_func, void() roundStart_func)
{
if (round_handler)
{
backtrace("Can't spawn round_handler again!");
return;
}
- entity this = round_handler = new(round_handler);
+ entity this = round_handler = new_pure(round_handler);
setthink(this, round_handler_FirstThink);
this.canRoundStart = canRoundStart_func;
void round_handler_Remove()
{
- remove(round_handler);
+ delete(round_handler);
round_handler = NULL;
}