Merge branch 'master' into terencehill/forced_intermission_eventchase

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_misc.c

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index 051520549d239dfec09a48243f0a1055ac908401..b9aab55ab74dda5cf007353946118592572a78f1 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -20,7 +20,7 @@ entity makeXonoticMiscSettingsTab()
 void XonoticMiscSettingsTab_fill(entity me)
 {
        entity e;
-       entity sk;
+       //entity sk;
 
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Network:")));
@@ -126,7 +126,7 @@ void XonoticMiscSettingsTab_fill(entity me)
                setDependent(e, "cl_maxfps", 1, 1000);
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
                        e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
                        e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");