Merge branch 'terencehill/teams_override_cvars' into 'master'

Terencehill/teams override cvars

Remove g_keepaway_teams_override from the menu as it doesn't exist anymore

See merge request !73

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
index cc57e5438911fd8bffa0c795e81bc0cc0e4b0dac..bbffb52765b310401f005ff59d5d6f2a4848a9db 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
@@ -190,19 +190,17 @@ void XonoticServerCreateTab_gameTypeChangeNotify(entity me)
                default:                      GameType_ConfigureSliders(e, l, _("Frag limit:"),      5,  100,  5, "fraglimit_override");       break;
        }
 
-       float x = FALSE;
+       string x = string_null;
        e = me.sliderTeams;
        switch(gt)
        {
-               case MAPINFO_TYPE_CA:               x = TRUE; e.configureXonoticTextSlider(e, "g_ca_teams_override");          break;
-               case MAPINFO_TYPE_DOMINATION:       x = TRUE; e.configureXonoticTextSlider(e, "g_domination_teams_override");  break;
-               case MAPINFO_TYPE_FREEZETAG:        x = TRUE; e.configureXonoticTextSlider(e, "g_freezetag_teams_override");   break;
-               case MAPINFO_TYPE_KEEPAWAY:         x = TRUE; e.configureXonoticTextSlider(e, "g_keepaway_teams_override");    break;
-               case MAPINFO_TYPE_KEYHUNT:          x = TRUE; e.configureXonoticTextSlider(e, "g_keyhunt_teams_override");     break;
-               case MAPINFO_TYPE_TEAM_DEATHMATCH:  x = TRUE; e.configureXonoticTextSlider(e, "g_tdm_teams_override");         break;
-
-               default: x = FALSE; e.configureXonoticTextSlider(e, string_null); break;
+               case MAPINFO_TYPE_CA:               x = "g_ca_teams_override";          break;
+               case MAPINFO_TYPE_DOMINATION:       x = "g_domination_teams_override";  break;
+               case MAPINFO_TYPE_FREEZETAG:        x = "g_freezetag_teams_override";   break;
+               case MAPINFO_TYPE_KEYHUNT:          x = "g_keyhunt_teams_override";     break;
+               case MAPINFO_TYPE_TEAM_DEATHMATCH:  x = "g_tdm_teams_override";         break;
        }
+       e.configureXonoticTextSlider(e, x);
        e.configureXonoticTextSliderValues(e);
        if(!x)
                e.value = 0;