Merge branch 'bones_was_here/showspec' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / world.qc

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 69eefdc5cdbe76e5a025a5e57e8dfdf2abbd7228..fca7c1741497e7a092245ad376744a1b3e4b630a 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -821,11 +821,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();
@@ -2146,7 +2146,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); });