X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=fa970f955e0d9fddf7f4af0b11c92dc46bd7047b;hb=67610c5b92e218cc245c040209c1a79ab6b02758;hp=3b11c5f9b6f409e0d51948286cab7160041b3270;hpb=4f133bdb70d13143f2ce4b9de097744371c1f92a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 3b11c5f9b..fa970f955 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,23 +1,28 @@
 #include "round_handler.qh"
 
+#include <server/world.qh>
+#include "campaign.qh"
 #include "command/vote.qh"
+#include <common/mapobjects/triggers.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)
+	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;
@@ -28,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;
@@ -73,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;
@@ -81,7 +86,7 @@ void round_handler_FirstThink(entity this)
 	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)
 	{