From: terencehill <piuntn@gmail.com>
Date: Sat, 11 Jan 2020 23:15:57 +0000 (+0100)
Subject: Revert "Make sure g_campaign is always reset to 0 on disconnection (without relying... 
X-Git-Tag: xonotic-v0.8.5~1105^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4e88ea7edc06a6cd082d8d05547465418291c46;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "Make sure g_campaign is always reset to 0 on disconnection (without relying on the "Start Multiplayer!" button of the menu)"

This reverts commit c8534e0bb85fe93b76ad32415bb0581d4771dd9b.
---

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index ea5af0438..f0fcea6ab 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -129,9 +129,6 @@ void CampaignPreInit()
 	cvar_set("skill", ftos(baseskill));
 	cvar_set("bot_number", ftos(campaign_bots[0]));
 #else
-	// since g_campaign is already set to 1 by the menu when starting a campaign level, we first need
-	// to set it back to 0 before settemping it to 1 so it'll be correctly restored to 0 on disconnection
-	cvar_set("g_campaign", "0");
 	cvar_settemp("g_campaign", "1");
 	cvar_settemp("g_dm", "0");
 	cvar_settemp("skill", ftos(baseskill));