Merge branch 'master' into save_ext

# Conflicts:
#	src/saveload/saveload.cpp

src/table/settings.ini

@@ -2569,13 +2569,17 @@ strhelp  = STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT
 strval   = STR_CONFIG_SETTING_AUTOSCROLL_DISABLED
 cat      = SC_BASIC
 
-[SDTC_BOOL]
-var      = gui.reverse_scroll
+[SDTC_VAR]
+var      = gui.scroll_mode
+type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = false
-str      = STR_CONFIG_SETTING_REVERSE_SCROLLING
-strhelp  = STR_CONFIG_SETTING_REVERSE_SCROLLING_HELPTEXT
-cat      = SC_BASIC
+guiflags = SGF_MULTISTRING
+def      = 0
+min      = 0
+max      = 3
+str      = STR_CONFIG_SETTING_SCROLLMODE
+strhelp  = STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT
+strval   = STR_CONFIG_SETTING_SCROLLMODE_DEFAULT
 
 [SDTC_BOOL]
 var      = gui.smooth_scroll
@@ -2584,14 +2588,6 @@ def      = false
 str      = STR_CONFIG_SETTING_SMOOTH_SCROLLING
 strhelp  = STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT
 
-[SDTC_BOOL]
-var      = gui.left_mouse_btn_scrolling
-flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = false
-str      = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
-strhelp  = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT
-cat      = SC_BASIC
-
 [SDTC_BOOL]
 var      = gui.right_mouse_wnd_close
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC