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

Merge branch 'jgrpp' into chunnel

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-03-05 15:30:27 +00:00
parent 500ef49694 fa044852d5
commit 0690dbb8bf
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_config.cpp
View File

@@ -915,9 +915,6 @@ char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last)
return dst; return dst;
} }
/** Base GRF ID for OpenTTD's base graphics GRFs. */
static const uint32 OPENTTD_GRAPHICS_BASE_GRF_ID = BSWAP32(0xFF4F5400);
/** /**
* Search a textfile file next to this NewGRF. * Search a textfile file next to this NewGRF.
* @param type The type of the textfile to search for. * @param type The type of the textfile to search for.

10
src/saveload/afterload.cpp
View File

@@ -780,6 +780,11 @@ bool AfterLoadGame()
assert(_tick_skip_counter < _settings_game.economy.day_length_factor); assert(_tick_skip_counter < _settings_game.economy.day_length_factor);
} }
/* Set day length factor to 1 if loading a pre day length savegame */
if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH) && SlXvIsFeatureMissing(XSLFI_SPRINGPP)) {
_settings_game.economy.day_length_factor = 1;
}
/* Update current year /* Update current year
* must be done before loading sprites as some newgrfs check it */ * must be done before loading sprites as some newgrfs check it */
SetDate(_date, _date_fract); SetDate(_date, _date_fract);
@@ -3376,6 +3381,11 @@ bool AfterLoadGame()
_settings_game.economy.town_cargo_scale_factor = _settings_game.economy.old_town_cargo_factor * 10; _settings_game.economy.town_cargo_scale_factor = _settings_game.economy.old_town_cargo_factor * 10;
} }
/* Set day length factor to 1 if loading a pre day length savegame */
if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH) && SlXvIsFeatureMissing(XSLFI_SPRINGPP)) {
_settings_game.economy.day_length_factor = 1;
}
/* Road stops is 'only' updating some caches */ /* Road stops is 'only' updating some caches */
AfterLoadRoadStops(); AfterLoadRoadStops();
AfterLoadLabelMaps(); AfterLoadLabelMaps();

1
src/saveload/extended_ver_sl.cpp
View File

@@ -137,6 +137,7 @@ void SlXvResetState()
{ {
_sl_is_ext_version = false; _sl_is_ext_version = false;
_sl_is_faked_ext = false; _sl_is_faked_ext = false;
_sl_xv_discardable_chunk_ids.clear();
memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions)); memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions));
} }

7
src/saveload/station_sl.cpp
View File

@@ -327,6 +327,10 @@ static void SwapPackets(GoodsEntry *ge)
static void Load_STNS() static void Load_STNS()
{ {
_cargo_source_xy = 0;
_cargo_days = 0;
_cargo_feeder_share = 0;
int index; int index;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
Station *st = new (index) Station(); Station *st = new (index) Station();
@@ -519,8 +523,9 @@ static void Save_STNN()
static void Load_STNN() static void Load_STNN()
{ {
int index; _num_flows = 0;
int index;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
bool waypoint = (SlReadByte() & FACIL_WAYPOINT) != 0; bool waypoint = (SlReadByte() & FACIL_WAYPOINT) != 0;