From: Rudolf Polzer <divverent@gmail.com>
Date: Sun, 11 Jan 2015 16:22:12 +0000 (+0000)
Subject: Merge branch 'terencehill/teams_override_cvars' into 'master'
X-Git-Tag: xonotic-v0.8.0~3
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=b5c7eb4ebce0271e742eb850ad9b974a1540fef3;hp=2d826438b2ebd36c678772891253184fc7d483ff;p=xonotic%2Fxonotic-data.pk3dir.git

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 cc57e5438..bbffb5276 100644
--- 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;