Menu: avoid loading font twice on resolution switch; avoid extra r_restart on resolut...

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
index 509825047ee32d72c8de3ccd92c1cc03ba575c84..c55d4d488ba4ebcf37f2fd096fcf27a81e5c79ba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c
@@ -6,7 +6,7 @@ CLASS(XonoticModelDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticModelDialog, title, string, _("Model settings"))
        ATTRIB(XonoticModelDialog, color, vector, SKINCOLOR_DIALOG_MODEL)
        ATTRIB(XonoticModelDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticModelDialog, rows, float, 8)
+       ATTRIB(XonoticModelDialog, rows, float, 7)
        ATTRIB(XonoticModelDialog, columns, float, 3)
 ENDCLASS(XonoticModelDialog)
 #endif
@@ -37,15 +37,6 @@ void XonoticModelDialog_fill(entity me)
                        e.configureXonoticTextSliderValues(e);
                        setDependent(e, "cl_gentle", 0, 0);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Playermodel LOD:")));
-               me.TD(me, 1, 2, e = makeXonoticSlider(0, 10, 1, "cl_playerdetailreduction"));
-       me.TR(me);
-       #ifdef ALLOW_FORCEMODELS
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force models:")));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, ZCTX(_("MDL^None"))));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodelsfromxonotic", string_null, ZCTX(_("MDL^Custom"))));
-               me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodels", string_null, ZCTX(_("MDL^All"))));
-       #endif
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
        me.TR(me);