miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.0

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2018-04-06 21:26:22 +03:00
parent c13f57641c
commit 42ec3bd611
221 changed files with 2325 additions and 1788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/saveload/afterload.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: afterload.cpp 27760 2017-02-26 20:31:02Z frosch $ */
/* $Id: afterload.cpp 27893 2017-08-13 18:38:42Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -154,7 +154,7 @@ static void ConvertTownOwner()
if (GB(_m[tile].m5, 4, 2) == ROAD_TILE_CROSSING && HasBit(_m[tile].m3, 7)) {
_m[tile].m3 = OWNER_TOWN;
}
/* FALL THROUGH */
FALLTHROUGH;
case MP_TUNNELBRIDGE:
if (_m[tile].m1 & 0x80) SetTileOwner(tile, OWNER_TOWN);
src/saveload/company_sl.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: company_sl.cpp 27757 2017-02-26 19:41:14Z frosch $ */
/* $Id: company_sl.cpp 27893 2017-08-13 18:38:42Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -185,7 +185,7 @@ void AfterLoadCompanyStats()
}
}
}
/* FALL THROUGH */
FALLTHROUGH;
case MP_OBJECT:
if (GetWaterClass(tile) == WATER_CLASS_CANAL) {
src/saveload/industry_sl.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: industry_sl.cpp 27291 2015-05-21 18:59:11Z frosch $ */
/* $Id: industry_sl.cpp 27929 2017-10-25 15:38:19Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -57,7 +57,7 @@ static const SaveLoad _industry_desc[] = {
SLEG_CONDARR(_old_ind_persistent_storage.storage, SLE_UINT32, 16, 76, 160),
SLE_CONDREF(Industry, psa, REF_STORAGE, 161, SL_MAX_VERSION),
SLE_CONDVAR(Industry, random_triggers, SLE_UINT8, 82, SL_MAX_VERSION),
SLE_CONDNULL(1, 82, 196), // random_triggers
SLE_CONDVAR(Industry, random, SLE_UINT16, 82, SL_MAX_VERSION),
SLE_CONDNULL(32, 2, 143), // old reserved space
src/saveload/saveload.cpp
+3 -2
View File
@@ -1,4 +1,4 @@
/* $Id: saveload.cpp 27862 2017-05-03 20:05:52Z frosch $ */
/* $Id: saveload.cpp 27990 2018-03-14 18:05:06Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -264,8 +264,9 @@
* 194 26881 1.5.x, 1.6.0
* 195 27572 1.6.x
* 196 27778 1.7.x
* 197 27978 1.8.x
*/
extern const uint16 SAVEGAME_VERSION = 196; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 197; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading
FileToSaveLoad _file_to_saveload; ///< File to save or load in the openttd loop.
src/saveload/vehicle_sl.cpp
+4 -2
View File
@@ -1,4 +1,4 @@
/* $Id: vehicle_sl.cpp 27668 2016-10-16 14:59:44Z frosch $ */
/* $Id: vehicle_sl.cpp 27893 2017-08-13 18:38:42Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -375,6 +375,8 @@ void AfterLoadVehicles(bool part_of_load)
FOR_ALL_VEHICLES(v) {
assert(v->first != NULL);
v->trip_occupancy = CalcPercentVehicleFilled(v, NULL);
switch (v->type) {
case VEH_TRAIN: {
Train *t = Train::From(v);
@@ -431,8 +433,8 @@ void AfterLoadVehicles(bool part_of_load)
RoadVehicle *rv = RoadVehicle::From(v);
rv->roadtype = HasBit(EngInfo(v->First()->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD;
rv->compatible_roadtypes = RoadTypeToRoadTypes(rv->roadtype);
/* FALL THROUGH */
}
FALLTHROUGH;
case VEH_TRAIN:
case VEH_SHIP: