From f999e7a2a025f273ec0f3d41fe67b4b5928618f4 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 12 May 2021 16:04:49 +0200 Subject: [PATCH] Don't allow changing menu settings that can affect current campaign game --- qcsrc/menu/xonotic/dialog_multiplayer_create.qc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc index f88fcf8c9..89e015bd7 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc @@ -132,11 +132,13 @@ void XonoticServerCreateTab_fill(entity me) _("The maximum amount of players or bots that can be connected to your server at once"))); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Number of bots:"))); + setDependent(e, "g_campaign", 0, 0); me.TD(me, 1, 2, e = makeXonoticSlider_T(0, 9, 1, "bot_number", _("Amount of bots on your server"))); + setDependent(e, "g_campaign", 0, 0); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Bot skill:"))); - setDependent(e, "bot_number", 0, -1); + setDependentAND(e, "bot_number", 0, -1, "g_campaign", 0, 0); me.TD(me, 1, 2, e = makeXonoticTextSlider_T("skill", _("Specify how experienced the bots will be"))); e.addValue(e, _("Botlike"), "0"); @@ -151,13 +153,14 @@ void XonoticServerCreateTab_fill(entity me) e.addValue(e, _("Unhuman"), "9"); e.addValue(e, _("Godlike"), "10"); e.configureXonoticTextSliderValues(e); - setDependent(e, "bot_number", 0, -1); + setDependentAND(e, "bot_number", 0, -1, "g_campaign", 0, 0); me.gotoRC(me, me.rows - 3.8, 0); me.TD(me, 1, 3, e0 = makeXonoticTextLabel(0.5, string_null)); e0.textEntity = main.mutatorsDialog; e0.allowCut = 1; //e0.allowWrap = 1; + setDependent(e0, "g_campaign", 0, 0); // mapListBox is in the right column but the ref is needed for mutators dialog here me.mapListBox = makeXonoticMapList(); @@ -170,6 +173,7 @@ void XonoticServerCreateTab_fill(entity me) e.onClick = DialogOpenButton_Click; e.onClickEntity = main.mutatorsDialog; main.mutatorsDialog.refilterEntity = me.mapListBox; + setDependent(e, "g_campaign", 0, 0); // The right half begins here -- 2.39.2