X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=8cc3295b9a5d4acfe8d59a7f77585e115a30ccf3;hp=ad0fcaae66278f5a93a47b76f76603874e6deda2;hb=d277ce54ca486de202a418e1adb275f3b69a98e6;hpb=aa14e2a0c66030cfde1c5d9d2c0882b5aa4816c1

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index ad0fcaae66..8cc3295b9a 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,5 +1,6 @@
 #include "round_handler.qh"
 
+#include "campaign.qh"
 #include "command/vote.qh"
 #include "../common/util.qh"
 
@@ -28,7 +29,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;
@@ -111,6 +112,6 @@ void round_handler_Reset(float next_think)
 
 void round_handler_Remove()
 {
-	remove(round_handler);
-	round_handler = world;
+	delete(round_handler);
+	round_handler = NULL;
 }