From: terencehill <piuntn@gmail.com>
Date: Thu, 14 Apr 2022 13:01:10 +0000 (+0200)
Subject: Campaign: make sure there's no countdown on map start; also disable player stats... 
X-Git-Tag: xonotic-v0.8.5~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75f6bd432f81c01d1536bdc964ec6a6accc92017;p=xonotic%2Fxonotic-data.pk3dir.git

Campaign: make sure there's no countdown on map start; also disable player stats recording
---

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 6ffc50617..3e1444a35 100644
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -40,8 +40,10 @@ void PlayerStats_GameReport_Reset_All()
 	strfree(PS_GR_OUT_EVL);
 
 	if (PS_GR_OUT_DB >= 0)
+	{
 		db_close(PS_GR_OUT_DB);
-	PlayerStats_GameReport_Init();
+		PlayerStats_GameReport_Init();
+	}
 	if(PS_GR_OUT_DB < 0)
 		return;
 
diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 9d4678ffd..1381a02ab 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -820,11 +820,11 @@ spawnfunc(worldspawn)
 
 	if(autocvar_g_campaign)
 		CampaignPreInit();
+	else
+		PlayerStats_GameReport_Init(); // we need this to be initiated before InitGameplayMode
 
 	Map_MarkAsRecent(mapname);
 
-	PlayerStats_GameReport_Init(); // we need this to be initiated before InitGameplayMode
-
 	InitGameplayMode();
 	static_init_late();
 	static_init_precache();
@@ -2145,7 +2145,7 @@ void readlevelcvars()
 
     MUTATOR_CALLHOOK(ReadLevelCvars);
 
-	if (!warmup_stage)
+	if (!warmup_stage && !autocvar_g_campaign)
 		game_starttime = time + cvar("g_start_delay");
 
 	FOREACH(Weapons, it != WEP_Null, { it.wr_init(it); });