Merge branch 't0uYK8Ne/set_slick_friction' into 'master'

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

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index e80769cc2783edabcca7b1952aafbb5f9b06a256..ddc7e47fa6c31386d3ff17c3d9b2d6e0a441ecbc 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -52,8 +52,7 @@ void cvar_set_campaignwrapper(string theCvar, string theValue)
 {
        if(cvar_string_campaignwrapper(theCvar) == theValue)
                return;
-       string s;
-       s = cvar_campaignwrapper_list;
+       string s = cvar_campaignwrapper_list;
        cvar_campaignwrapper_list = strzone(strcat("; ", theCvar, " ", theValue, s));
        strunzone(s);
        //print(cvar_campaignwrapper_list, "\n");
@@ -100,6 +99,8 @@ void CampaignPreInit()
        if(baseskill < 0)
                baseskill = 0;
 
+       campaign_forcewin = false;
+
        cvar_set("sv_public", "0");
        cvar_set("pausable", "1");
 
@@ -207,6 +208,11 @@ void CampaignPreIntermission()
                campaign_won = 1;
                bprint("Campaign test run, advancing level.\n");
        }
+       else if(campaign_forcewin)
+       {
+               campaign_won = 1;
+               bprint("The current level has been WON.\n");
+       }
        else if(won == 1 && lost == 0 && checkrules_equality == 0)
        {
                if(autocvar_timelimit != 0 && autocvar_fraglimit != 0 && time > autocvar_timelimit * 60) // checks if the timelimit has expired.