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

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-02-04 18:24:38 +00:00
parent 02e2627765 09c62d6951
commit 46b5b0155c
280 changed files with 11624 additions and 3855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/company_settings.ini
View File

@@ -32,7 +32,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()

2
src/table/currency_settings.ini
View File

@@ -25,7 +25,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()

23
src/table/engines.h
View File

@@ -28,6 +28,19 @@
*/
#define MT(a, b, c, d, e, f) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, f, e, 0, 8, 1 << EF_RAIL_FLIPS, 0, 0, STR_EMPTY, CARGO_AGING_TICKS }
/**
* Writes the properties of a multiple-unit train into the EngineInfo struct.
* @see EngineInfo
* @param a base introduction date (days since 1920-01-01)
* @param b decay speed
* @param c life length (years)
* @param d base life (years)
* @param e cargo type
* @param f Bitmask of the climates
* @note the 5 between b and f is the load amount
*/
#define MM(a, b, c, d, e, f) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, f, e, 0, 8, 1 << EF_RAIL_FLIPS | 1 << EF_RAIL_IS_MU, 0, 0, STR_EMPTY, CARGO_AGING_TICKS }
/**
* Writes the properties of a train carriage into the EngineInfo struct.
* @param a base introduction date (days since 1920-01-01)
@@ -102,8 +115,8 @@ static const EngineInfo _orig_engine_info[] = {
MT( 5114, 20, 21, 30, 0 , T ), // 8 Chaney 'Jubilee' (Steam)
MT( 5479, 20, 20, 30, 0 , T ), // 9 Ginzu 'A4' (Steam)
MT( 12419, 20, 23, 25, 0 , T ), // 10 SH '8P' (Steam)
MT( 13149, 20, 12, 30, CT_PASSENGERS , T ), // 11 Manley-Morel DMU (Diesel)
MT( 23376, 20, 15, 35, CT_PASSENGERS , T ), // 12 'Dash' (Diesel)
MM( 13149, 20, 12, 30, CT_PASSENGERS , T ), // 11 Manley-Morel DMU (Diesel)
MM( 23376, 20, 15, 35, CT_PASSENGERS , T ), // 12 'Dash' (Diesel)
MT( 14976, 20, 18, 28, 0 , T ), // 13 SH/Hendry '25' (Diesel)
MT( 14245, 20, 20, 30, 0 , T ), // 14 UU '37' (Diesel)
MT( 15341, 20, 22, 33, 0 , T ), // 15 Floss '47' (Diesel)
@@ -111,13 +124,13 @@ static const EngineInfo _orig_engine_info[] = {
MT( 16437, 20, 20, 30, 0 , A|S ), // 17 CS 2400 (Diesel)
MT( 18993, 20, 22, 30, 0 , A|S ), // 18 Centennial (Diesel)
MT( 13880, 20, 22, 30, 0 , A|S ), // 19 Kelling 3100 (Diesel)
MT( 20454, 20, 22, 30, 0 , A|S ), // 20 Turner Turbo (Diesel)
MM( 20454, 20, 22, 30, 0 , A|S ), // 20 Turner Turbo (Diesel)
MT( 16071, 20, 22, 30, 0 , A|S ), // 21 MJS 1000 (Diesel)
MT( 20820, 20, 20, 25, CT_MAIL , T ), // 22 SH '125' (Diesel)
MT( 16437, 20, 23, 30, 0 , T ), // 23 SH '30' (Electric)
MT( 19359, 20, 23, 80, 0 , T ), // 24 SH '40' (Electric)
MT( 23376, 20, 25, 30, 0 , T ), // 25 'T.I.M.' (Electric)
MT( 26298, 20, 25, 50, 0 , T ), // 26 'AsiaStar' (Electric)
MM( 23376, 20, 25, 30, 0 , T ), // 25 'T.I.M.' (Electric)
MM( 26298, 20, 25, 50, 0 , T ), // 26 'AsiaStar' (Electric)
MW( 1827, 20, 20, 50, CT_PASSENGERS , T|A|S|Y), // 27 Passenger Carriage
MW( 1827, 20, 20, 50, CT_MAIL , T|A|S|Y), // 28 Mail Van
MW( 1827, 20, 20, 50, CT_COAL , T|A ), // 29 Coal Truck

16
src/table/gameopt_settings.ini
View File

@@ -59,7 +59,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()
@@ -79,7 +79,7 @@ def = 0
min = 0
max = 0
full = NULL
to = 3
to = SLV_4
[SDTG_GENERAL]
name = ""diff_custom""
@@ -93,7 +93,7 @@ def = 0
min = 0
max = 0
full = NULL
from = 4
from = SLV_4
##
[SDTG_VAR]
@@ -154,21 +154,21 @@ type = SLE_UINT8
def = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
min = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
max = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
to = 21
to = SLV_22
[SDT_NULL]
length = 1
from = 22
to = 164
from = SLV_22
to = SLV_165
[SDT_NULL]
length = 1
to = 22
to = SLV_23
[SDTC_OMANY]
var = gui.autosave
type = SLE_UINT8
from = 23
from = SLV_23
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 1
max = 4

2
src/table/misc_settings.ini
View File

@@ -32,7 +32,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()

368
src/table/settings.ini
View File

File diff suppressed because it is too large Load Diff

7
src/table/sprites.h
View File

@@ -56,7 +56,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682;
/** Extra graphic spritenumbers */
static const SpriteID SPR_OPENTTD_BASE = 4896;
static const uint16 OPENTTD_SPRITE_COUNT = 175;
static const uint16 OPENTTD_SPRITE_COUNT = 179;
/* Halftile-selection sprites */
static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE;
@@ -149,6 +149,11 @@ static const SpriteID SPR_GROUP_REPLACE_OFF_ROADVEH = SPR_OPENTTD_BASE + 131;
static const SpriteID SPR_GROUP_REPLACE_OFF_SHIP = SPR_OPENTTD_BASE + 132;
static const SpriteID SPR_GROUP_REPLACE_OFF_AIRCRAFT = SPR_OPENTTD_BASE + 133;
static const SpriteID SPR_GROUP_LIVERY_TRAIN = SPR_OPENTTD_BASE + 175;
static const SpriteID SPR_GROUP_LIVERY_ROADVEH = SPR_OPENTTD_BASE + 176;
static const SpriteID SPR_GROUP_LIVERY_SHIP = SPR_OPENTTD_BASE + 177;
static const SpriteID SPR_GROUP_LIVERY_AIRCRAFT = SPR_OPENTTD_BASE + 178;
static const SpriteID SPR_TOWN_RATING_NA = SPR_OPENTTD_BASE + 162;
static const SpriteID SPR_TOWN_RATING_APALLING = SPR_OPENTTD_BASE + 163;
static const SpriteID SPR_TOWN_RATING_MEDIOCRE = SPR_OPENTTD_BASE + 164;

7
src/table/town_land.h
View File

@@ -1812,8 +1812,11 @@ assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4);
* @see HouseSpec
*/
#define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \
{mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \
GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
{mnd, mxd, p, rc, bn, rr, mg, \
{ca1, ca2, ca3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
{cg1, cg2, cg3, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, \
bf, ba, true, GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, \
16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
/** House specifications from original data */
static const HouseSpec _original_house_specs[] = {
/**

112
src/table/townname.h
View File

@@ -762,7 +762,7 @@ static const char * const _name_french_real[] = {
"Blois",
"Troyes",
"Charolles",
"Grenoble",
"Toulouse",
"Chamb\xC3\xA9ry",
"Tours",
"St. Brieuc",
@@ -773,7 +773,7 @@ static const char * const _name_french_real[] = {
"Vichy",
"St. Valery",
"Beaujolais",
"Narbonne",
"Reims",
"Albi",
"Paris",
"Biarritz",
@@ -1946,103 +1946,103 @@ static const char * const _name_romanian_real[] = {
"Alba Iulia",
"Alexandria",
"Babadag",
"Bac\xC3\xA3u",
"Bac\xC4\x83u",
"Baia Mare",
"B\xC3\xA3ile Herculane",
"B\xC3\xA3ilesti",
"B\xC4\x83ile Herculane",
"B\xC4\x83ilesti",
"B\xC3\xA2rlad",
"Bicaz",
"Bistrita",
"Bistri\xC8\x9B""a",
"Blaj",
"Borsec",
"Botosani",
"Br\xC3\xA3ila",
"Brasov",
"Bucuresti",
"Boto\xC8\x99""ani",
"Br\xC4\x83ila",
"Bra\xC8\x9Bov",
"Bucure\xC8\x99ti",
"Buftea",
"Buz\xC3\xA3u",
"C\xC3\xA3l\xC3\xA3rasi",
"Caransebes",
"Cernavod\xC3\xA3",
"Buz\xC4\x83u",
"C\xC4\x83l\xC4\x83rasi",
"Caransebe\xC8\x99",
"Cernavod\xC4\x83",
"Cluj-Napoca",
"Constanta",
"Constan\xC8\x9B""a",
"Covasna",
"Craiova",
"Dej",
"Deva",
"Dorohoi",
"Dr.-Tr. Severin",
"Dr\xC3\xA3g\xC3\xA3sani",
"F\xC3\xA3g\xC3\xA3ras",
"F\xC3\xA3lticeni",
"Fetesti",
"Focsani",
"Galati",
"Drobeta-Turnu Severin",
"Dr\xC4\x83g\xC4\x83sani",
"F\xC4\x83g\xC4\x83ras",
"F\xC4\x83lticeni",
"Fete\xC8\x99ti",
"Foc\xC8\x99""ani",
"Gala\xC8\x99i",
"Gheorgheni",
"Giurgiu",
"H\xC3\xA2rsova",
"H\xC3\xA2r\xC8\x99ova",
"Hunedoara",
"Husi",
"Iasi",
"Hu\xC8\x99i",
"Ia\xC8\x99i",
"Isaccea",
"Lugoj",
"M\xC3\xA3""cin",
"M\xC4\x83""cin",
"Mangalia",
"Medgidia",
"Medias",
"Media\xC8\x99",
"Miercurea Ciuc",
"Mizil",
"Motru",
"N\xC3\xA3s\xC3\xA3ud",
"N\xC3\xA3vodari",
"Odobesti",
"Oltenita",
"Onesti",
"N\xC4\x83s\xC4\x83ud",
"N\xC4\x83vodari",
"Odobe\xC8x99ti",
"Olteni\xC8\x9B""a",
"One\xC8\x99ti",
"Oradea",
"Orsova",
"Petrosani",
"Piatra Neamt",
"Pitesti",
"Ploiesti",
"Or\xC8\x99ova",
"Petro\xC8\x99""ani",
"Piatra Neam\xC8\x9B",
"Pite\xC8\x99ti",
"Ploie\xC8\x99ti",
"Predeal",
"R\xC3\xA2mnicu V\xC3\xA2lcea",
"Reghin",
"Resita",
"Re\xC8\x99i\xC8\x9B""a",
"Roman",
"Rosiorii de Vede",
"Ro\xC8\x99iorii de Vede",
"Satu Mare",
"Sebes",
"Sebe\xC8\x99",
"Sf\xC3\xA2ntu Gheorghe",
"Sibiu",
"Sighisoara",
"Sighi\xC8\x99oara",
"Sinaia",
"Slatina",
"Slobozia",
"Sovata",
"Suceava",
"Sulina",
"T\xC3\xA3nd\xC3\xA3rei",
"T\xC4\x83nd\xC4\x83rei",
"T\xC3\xA2rgoviste",
"T\xC3\xA2rgu Jiu",
"T\xC3\xA2rgu Mures",
"Tecuci",
"Timisoara",
"Timi\xC8\x99oara",
"Tulcea",
"Turda",
"Turnu M\xC3\xA3gurele",
"Turnu M\xC4\x83gurele",
"Urziceni",
"Vaslui",
"Vatra Dornei",
"Victoria",
"Videle",
"Zal\xC3\xA3u",
"Zal\xC4\x83u",
};
static const char * const _name_slovak_real[] = {
"Bratislava",
"Banovce nad Bebravou",
"Banska Bystrica",
"Banska Stiavnica",
"Bansk\xC3\xA1 Bystrica",
"Bansk\xC3\xA1 \xC5\xA0tiavnica",
"Bardejov",
"Brezno",
"Brezova pod Bradlom",
@@ -2050,9 +2050,9 @@ static const char * const _name_slovak_real[] = {
"Cadca",
"Cierna nad Tisou",
"Detva",
"Detva",
"Dolny Kubin",
"Pre\xC5\xA1ov",
"Dolny Kubin",
"Spi\xC5\xA1sk\xC3\xA1 Nov\xC3\xA1 Ves",
"Dunajska Streda",
"Gabcikovo",
"Galanta",
@@ -2064,8 +2064,8 @@ static const char * const _name_slovak_real[] = {
"Humenne",
"Hurbanovo",
"Kezmarok",
"Komarno",
"Kosice",
"Kom\xC3\xA1rno",
"Ko\xC5\xA1ice",
"Kremnica",
"Krompachy",
"Kuty",
@@ -2081,15 +2081,15 @@ static const char * const _name_slovak_real[] = {
"Myjava",
"Namestovo",
"Nitra",
"Nova Bana",
"Nove Mesto nad Vahom",
"Nove Zamky",
"Nov\xC3\xA1 Ba\xC5\x88""a",
"Nov\xC3\xA9"" Mesto nad V\xC3\xA1hom",
"Nov\xC3\xA9"" Z\xC3\xA1""mky",
"Partizanske",
"Pezinok",
"Piestany",
"Poltar",
"Poprad",
"Povazska Bystrica",
"Pova\xC5\xBEsk\xC3\xA1 Bystrica",
"Prievidza",
"Puchov",
"Revuca",
@@ -2123,7 +2123,7 @@ static const char * const _name_slovak_real[] = {
"Zahorska Bystrica",
"Zdiar",
"Ziar nad Hronom",
"Zilina",
"\xC5\xBDilina",
"Zlate Moravce",
"Zvolen",
};

2
src/table/win32_settings.ini
View File

@@ -30,7 +30,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()

2
src/table/window_settings.ini
View File

@@ -26,7 +26,7 @@ strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
strval = STR_NULL
proc = NULL
load = NULL
from = 0
from = SL_MIN_VERSION
to = SL_MAX_VERSION
cat = SC_ADVANCED
extver = SlXvFeatureTest()