dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-03 23:54:51 +01:00
parent 315eff1112 228f8fba55
commit ad1c402ad8
161 changed files with 1702 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/table/settings.ini
View File

@@ -3170,13 +3170,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
@@ -3185,14 +3189,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