Add a cvar that disables automatically loading the next map after a campaign level...

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index cd292c08f4861dc3004639de0ba9c731156e8738..0733eec84275547b8a44e915a83863989a709425 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -892,6 +892,7 @@ set quit_and_redirect ""    "set to an IP to redirect all players at the end of the
 \r
 // singleplayer campaign\r
 set g_campaign 0\r
+set g_campaign_changelevel 0 "When disabled, levels won't be automatically change after a match was won or lost (you're taken back to the menu instead)"\r
 seta g_campaign_name "voretournament"\r
 set g_campaign_skill 0\r
 set g_campaignvoretournament_index 0\r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 2034b45045ef288f4e6d3cfc26cb2ee117b6cb9c..f6dc068f5c26450247e5af6bcd5cfb4d927c9bb1 100644 (file)
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -1044,9 +1044,14 @@ float DoNextMapOverride()
 {\r
        if(cvar("g_campaign"))\r
        {\r
-               CampaignPostIntermission();\r
-               alreadychangedlevel = TRUE;\r
-               return TRUE;\r
+               if(cvar("g_campaign_changelevel"))\r
+               {\r
+                       CampaignPostIntermission();\r
+                       alreadychangedlevel = TRUE;\r
+                       return TRUE;\r
+               }\r
+               else\r
+                       localcmd("togglemenu 1\n");\r
        }\r
        if(cvar("quit_when_empty"))\r
        {\r