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/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-20 13:15:32 +00:00
parent 5723c317f7 ad90e88ebd
commit 0691b25e17
14 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/cargo_const.h
View File

@@ -44,7 +44,7 @@
* @param classes Classes of this cargo type. @see CargoClass
*/
#define MK(bt, label, colour, weight, mult, ip, td1, td2, freight, te, str_plural, str_singular, str_volume, classes) \
{bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, 0, \
{bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, \
MK_STR_CARGO_PLURAL(str_plural), MK_STR_CARGO_SINGULAR(str_singular), str_volume, MK_STR_QUANTITY(str_plural), MK_STR_ABBREV(str_plural), \
MK_SPRITE(str_plural), classes, nullptr, nullptr, 0}

2
src/table/settings/settings.ini
View File

@@ -3246,7 +3246,7 @@ cat = SC_EXPERT
[SDT_BOOL]
var = pf.yapf.rail_firstred_twoway_eol
from = SLV_28
def = false
def = true
cat = SC_EXPERT
[SDT_VAR]