From e921aae3bcd590437aa8c4d0a4a5fd3220221201 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sat, 23 Oct 2021 18:56:06 +0300
Subject: [PATCH] Fix modifer keys selection in settings ui

---
 cm_changelog.txt                         |  4 ++++
 src/table/settings/cmclient_settings.ini | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cm_changelog.txt b/cm_changelog.txt
index fcba930f3f..8dce6ab160 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -74,6 +74,10 @@ This is usable for any OpenTTD servers
 
 == CHANGELOG ==
 
+*** 12.1 (? Oct 2021) ***
+- Hide new auto-terraforming mode for polyrail behind a setting for now as it is still quite bugged.
+- Fix modifer keys selection in settings ui.
+
 *** 12.0 (17 Oct 2021) ***
 - Automatically search servers when opening multiplayer window.
 - Show town population instead of the name in IMBA minimap mode.
diff --git a/src/table/settings/cmclient_settings.ini b/src/table/settings/cmclient_settings.ini
index b925ad73ad..8d63daea1d 100644
--- a/src/table/settings/cmclient_settings.ini
+++ b/src/table/settings/cmclient_settings.ini
@@ -2,6 +2,7 @@
 static void cm_v_RedrawStatusBar(int32 p1);
 
 static std::initializer_list<const char*> _order_mod_actions{"nothing", "full_load", "transfer", "unload_all", "feeder_load", "feeder_unload", "no_load"};
+static std::initializer_list<const char*> _mod_keys{"none", "shift", "ctrl", "alt"};
 
 static const SettingVariant _cmclient_settings_table[] = {
 [post-amble]
@@ -167,10 +168,11 @@ def      = false
 str      = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES
 strhelp  = STR_CM_CONFIG_SETTING_LAND_TOOLTIPS_FOR_HOUSES_HELPTEXT
 
-[SDTC_VAR]
+[SDTC_OMANY]
 var      = gui.cm_fn_mod
 type     = SLE_UINT8
-guiflags = SGF_MULTISTRING
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+full     = _mod_keys
 def      = 2
 min      = 0
 max      = 3
@@ -179,10 +181,11 @@ strhelp  = STR_CM_CONFIG_SETTING_MODIFIER_FN_HELPTEXT
 strval   = STR_CM_CONFIG_SETTING_MODIFIER_NONE
 cat      = SC_ADVANCED
 
-[SDTC_VAR]
+[SDTC_OMANY]
 var      = gui.cm_remove_mod
 type     = SLE_UINT8
-guiflags = SGF_MULTISTRING
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+full     = _mod_keys
 def      = 2
 min      = 0
 max      = 3
@@ -191,10 +194,11 @@ strhelp  = STR_CM_CONFIG_SETTING_MODIFIER_REMOVE_HELPTEXT
 strval   = STR_CM_CONFIG_SETTING_MODIFIER_NONE
 cat      = SC_ADVANCED
 
-[SDTC_VAR]
+[SDTC_OMANY]
 var      = gui.cm_estimate_mod
 type     = SLE_UINT8
-guiflags = SGF_MULTISTRING
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
+full     = _mod_keys
 def      = 1
 min      = 0
 max      = 3