From: terencehill <piuntn@gmail.com>
Date: Sat, 6 Aug 2016 13:00:53 +0000 (+0200)
Subject: Update scoreboard cvars in the menu and add "Enable rows / columns highlighting"... 
X-Git-Tag: xonotic-v0.8.2~716^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bf174b3107ff2a016b4d434a3b5bb268885f4bb;p=xonotic%2Fxonotic-data.pk3dir.git

Update scoreboard cvars in the menu and add "Enable rows / columns highlighting" checkbox
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index 6525e2779..e16693675 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -43,20 +43,18 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Scoreboard")));
 	me.TR(me);
 	me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:")));
-	me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg"));
+	me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "hud_panel_scoreboard_bg_alpha"));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Fading speed:")));
 		me.TD(me, 1, 2, e = makeXonoticScoreboardFadeTimeSlider());
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Side padding:")));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0.05, 0.3, 0.01, "scoreboard_offset_left"));
-			makeMulti(e, "scoreboard_offset_right");
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_table_highlight", _("Enable rows / columns highlighting")));
 
 	me.TR(me);
 	//me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "scoreboard_respawntime_decimals", _("Show decimals in respawn countdown")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_respawntime_decimals", _("Show decimals in respawn countdown")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "scoreboard_accuracy", _("Show accuracy underneath scoreboard")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_scoreboard_accuracy", _("Show accuracy underneath scoreboard")));
 
 	me.TR(me);
 	me.TR(me);
diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc
index 1e4bdbca2..048a42184 100644
--- a/qcsrc/menu/xonotic/slider_sbfadetime.qc
+++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc
@@ -9,7 +9,7 @@ entity makeXonoticScoreboardFadeTimeSlider()
 }
 void XonoticScoreboardFadeTimeSlider_configureXonoticScoreboardFadeTimeSlider(entity me)
 {
-	me.configureXonoticTextSlider(me, "scoreboard_fadeinspeed", string_null);
+	me.configureXonoticTextSlider(me, "hud_panel_scoreboard_fadeinspeed", string_null);
 	me.addValue(me, ZCTX(_("PART^Slow")),     "5 2.5");
 	me.addValue(me, ZCTX(_("PART^Normal")),   "10 5");
 	me.addValue(me, ZCTX(_("PART^Fast")),     "15 7.5");
@@ -19,8 +19,8 @@ void XonoticScoreboardFadeTimeSlider_configureXonoticScoreboardFadeTimeSlider(en
 void XonoticScoreboardFadeTimeSlider_loadCvars(entity me)
 {
 	me.setValueFromIdentifier_noAnim(me, sprintf("%s %s",
-		cvar_string("scoreboard_fadeinspeed"),
-		cvar_string("scoreboard_fadeoutspeed")
+		cvar_string("hud_panel_scoreboard_fadeinspeed"),
+		cvar_string("hud_panel_scoreboard_fadeoutspeed")
 	));
 }
 void XonoticScoreboardFadeTimeSlider_saveCvars(entity me)
@@ -28,7 +28,7 @@ void XonoticScoreboardFadeTimeSlider_saveCvars(entity me)
 	if(me.value >= 0 || me.value < me.nValues)
 	{
 		tokenize_console(me.getIdentifier(me));
-		cvar_set("scoreboard_fadeinspeed", argv(0));
-		cvar_set("scoreboard_fadeoutspeed", argv(1));
+		cvar_set("hud_panel_scoreboard_fadeinspeed", argv(0));
+		cvar_set("hud_panel_scoreboard_fadeoutspeed", argv(1));
 	}
 }