From: terencehill <piuntn@gmail.com>
Date: Fri, 18 Nov 2016 16:39:08 +0000 (+0100)
Subject: Campaign: don't start the first round until player joined the game
X-Git-Tag: xonotic-v0.8.2~431
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d277ce54ca486de202a418e1adb275f3b69a98e6;p=xonotic%2Fxonotic-data.pk3dir.git

Campaign: don't start the first round until player joined the game
---

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 3b11c5f9b..8cc3295b9 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;