Fix hud_shownames in the menu

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 17b12896c44f3a9d994a5f744473e77144c2c6e9..caa986d4362a081bd6270f704d60b0e581c23c02 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -192,7 +192,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "hud_damage"));
 
        me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_shownames;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
+               me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";cl_cmd sendcvar cl_weaponpriority;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;sendcvar cl_forceplayermodelsfromxonotic;sendcvar cl_forceplayermodels;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
 }
 void HUDSetup_Join_Click(entity me, entity btn)
 {

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
index 5805d2ea11de914382ad11beb108db1f71f60a55..7ded2c5054c5fae01b84e2f2ed0f8eb424cf6f30 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
@@ -5,7 +5,7 @@ CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticWaypointDialog, title, string, _("Waypoints"))
        ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_WAYPOINTS)
        ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticWaypointDialog, rows, float, 6)
+       ATTRIB(XonoticWaypointDialog, rows, float, 5)
        ATTRIB(XonoticWaypointDialog, columns, float, 3)
 ENDCLASS(XonoticWaypointDialog)
 #endif
@@ -30,13 +30,7 @@ void XonoticWaypointDialog_fill(entity me)
                        me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
                                setDependent(e, "cl_hidewaypoints", 0, 0);
        me.TR(me);
-       me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Show names:")));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_shownames"));
-                       e.addValue(e, _("Never"), "0");
-                       e.addValue(e, _("Teammates"), "1");
-                       e.addValue(e, _("All players"), "2");
-                       e.configureXonoticTextSliderValues(e);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_shownames", _("Show names above players")));
        me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
                        e.onClick = Dialog_Close;