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

Merge branch 'master' into jgrpp-nrt

Browse Source 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2019-07-11 20:03:23 +01:00
parent ba8ed880c1 f1c3915341
commit dbc5f1baed
118 changed files with 2968 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/table/misc_settings.ini
View File

@@ -146,35 +146,35 @@ var = _rightclick_emulate
def = false
[SDTG_STR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""small_font""
type = SLE_STRB
var = _freetype.small.font
def = nullptr
[SDTG_STR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""medium_font""
type = SLE_STRB
var = _freetype.medium.font
def = nullptr
[SDTG_STR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""large_font""
type = SLE_STRB
var = _freetype.large.font
def = nullptr
[SDTG_STR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""mono_font""
type = SLE_STRB
var = _freetype.mono.font
def = nullptr
[SDTG_VAR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""small_size""
type = SLE_UINT
var = _freetype.small.size
@@ -183,7 +183,7 @@ min = 0
max = 72
[SDTG_VAR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""medium_size""
type = SLE_UINT
var = _freetype.medium.size
@@ -192,7 +192,7 @@ min = 0
max = 72
[SDTG_VAR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""large_size""
type = SLE_UINT
var = _freetype.large.size
@@ -201,7 +201,7 @@ min = 0
max = 72
[SDTG_VAR]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""mono_size""
type = SLE_UINT
var = _freetype.mono.size
@@ -210,25 +210,25 @@ min = 0
max = 72
[SDTG_BOOL]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""small_aa""
var = _freetype.small.aa
def = false
[SDTG_BOOL]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""medium_aa""
var = _freetype.medium.aa
def = false
[SDTG_BOOL]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""large_aa""
var = _freetype.large.aa
def = false
[SDTG_BOOL]
ifdef = WITH_FREETYPE
ifdef = HAS_TRUETYPE_FONT
name = ""mono_aa""
var = _freetype.mono.aa
def = false