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

(svn r21862) -Codechange: Unify subtype handling between road vehicles and trains.

Browse Source
This commit is contained in:
terkhen
2011-01-19 20:04:09 +00:00
parent be44f1306f
commit d426906a01
5 changed files with 127 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/saveload/saveload.cpp
View File

@@ -221,8 +221,9 @@
* 154 21426
* 155 21453
* 156 21728
* 157 21862
*/
extern const uint16 SAVEGAME_VERSION = 156; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 157; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading

17
src/saveload/vehicle_sl.cpp
View File

@@ -308,6 +308,23 @@ void AfterLoadVehicles(bool part_of_load)
}
}
if (IsSavegameVersionBefore(157)) {
/* The road vehicle subtype was converted to a flag. */
RoadVehicle *rv;
FOR_ALL_ROADVEHICLES(rv) {
if (rv->subtype == 0) {
/* The road vehicle is at the front. */
rv->SetFrontEngine();
} else if (rv->subtype == 1) {
/* The road vehicle is an articulated part. */
rv->subtype = 0;
rv->SetArticulatedPart();
} else {
NOT_REACHED();
}
}
}
CheckValidVehicles();
FOR_ALL_VEHICLES(v) {