Merge branch 'master' into martin-t/defaults

[xonotic/xonotic-data.pk3dir.git] / xonotic-server.cfg

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index cea26f6a4e620c4ca1822592114bf435117bbc5a..058a7f6519edbb8745e3ee4c33230ae36604e0e7 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -339,13 +339,13 @@ set g_maplist_votable_keeptwotime 15 "show only 2 options after this amount of t
 set g_maplist_votable_timeout 30       "timeout for the map voting; must be below 50 seconds!"
 set g_maplist_votable_suggestions 2
 set g_maplist_votable_suggestions_override_mostrecent 0
-set g_maplist_votable_nodetail 1       "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much"
+set g_maplist_votable_nodetail 0       "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much"
 set g_maplist_votable_abstain 0        "when 1, you can abstain from your vote"
 set g_maplist_votable_screenshot_dir "maps levelshots" "where to look for map screenshots"
 
-set sv_vote_gametype 0 "show a vote screen for gametypes before map vote screen"
+set sv_vote_gametype 1 "show a vote screen for gametypes before map vote screen"
 set sv_vote_gametype_keeptwotime 10 "show only 2 options after this amount of time during gametype vote screen"
-set sv_vote_gametype_options "dm ctf ca lms tdm ft"
+set sv_vote_gametype_options "dm tdm ctf"
 set sv_vote_gametype_timeout 20
 set sv_vote_gametype_default_current 1 "Keep the current gametype if no one votes"