Merge branch 'master' into Mario/q3compat_sanity

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

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index a368938c2ddd37595fa7db9cb9ad96517ab25a4d..21a8c92b173ab8f0a53c1958d026a8da1031b8ef 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -33,7 +33,7 @@ float Campaign_Invalid()
        string thismapname, wantedmapname;
        thismapname = GetMapname();
        wantedmapname = campaign_gametype[0];
-       if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname, false))
+       if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname, false, false))
                return CampaignBailout("wrong game type!");
        wantedmapname = campaign_mapname[0];
        if(wantedmapname != thismapname)
@@ -67,7 +67,7 @@ void CampaignPreInit()
 
        if(autocvar_sv_cheats)
        {
-               MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
+               MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false, false));
                CampaignFile_Unload();
                CampaignBailout("JOLLY CHEATS AHAHAHAHAHAHAH))");
                return;
@@ -96,7 +96,7 @@ void CampaignPreInit()
        cvar_settemp("skill", ftos(baseskill));
        cvar_settemp("bot_number", ftos(campaign_bots[0]));
 
-       MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
+       MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false, false));
 
        if(Campaign_Invalid())
                return;