]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Campaign: don't start the first round until player joined the game
authorterencehill <piuntn@gmail.com>
Fri, 18 Nov 2016 16:39:08 +0000 (17:39 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 18 Nov 2016 16:39:08 +0000 (17:39 +0100)
qcsrc/server/round_handler.qc

index 3b11c5f9b6f409e0d51948286cab7160041b3270..8cc3295b9a5d4acfe8d59a7f77585e115a30ccf3 100644 (file)
@@ -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;