Fix selected maps in the menu not being saved

diff --git a/defaultServer.cfg b/defaultServer.cfg
index 99845f6480f256dd2eaf79057b48ce76997b5a5b..db91e385495a17e66d07aa3dfb8c955476085f2f 100644 (file)
--- a/defaultServer.cfg
+++ b/defaultServer.cfg
@@ -202,7 +202,6 @@ set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: s
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 set g_maplist_mostrecent_count 3       "number of most recent maps that are blocked from being played again"
-set g_maplist "" "the list of maps to be cycled among (is autogenerated if empty)"
 set g_maplist_index 0  "this is used internally for saving position in maplist cycle"
 set g_maplist_selectrandom 0   "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
 set g_maplist_shuffle 1        "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index eb6c72a5640408a2167b68bacd6ed45440ca5752..bac826e806f97192cd77e8413ec60cd2d76e2a03 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -52,6 +52,9 @@ set _campaign_index ""
 set _campaign_name ""
 set _campaign_testrun 0 "To verify the campaign file, set this to 1, then start the first campaign level from the menu. If you end up in the menu again, it's good, if you get a QC crash, it's bad."
 
+// used by both server and menu to maintain the available list of maps
+seta g_maplist "" "the list of maps to be cycled among (is autogenerated if empty)"
+
 // we must change its default from 1.0 to 1 to be consistent with menuqc
 set slowmo 1