mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17429) -Fix (r16378): conversion of TTO/TTD savegames failed when vehicle 0 was a wagon

release/1.0
smatz 2009-09-06 09:56:12 +00:00
parent bc5241600a
commit f9257fabea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/saveload/oldloader_sl.cpp
View File

@ -169,7 +169,11 @@ void FixOldVehicles()
Vehicle *v; Vehicle *v;
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (v->next != NULL) v->next = Vehicle::Get((size_t)v->next); if ((size_t)v->next == 0xFFFF) {
v->next = NULL;
} else {
v->next = Vehicle::GetIfValid((size_t)v->next);
}
/* For some reason we need to correct for this */ /* For some reason we need to correct for this */
switch (v->spritenum) { switch (v->spritenum) {
@ -1396,7 +1400,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
} }
v->current_order.AssignOrder(UnpackOldOrder(_old_order)); v->current_order.AssignOrder(UnpackOldOrder(_old_order));
if (_old_next_ptr != 0xFFFF) v->next = (Vehicle *)(size_t)_old_next_ptr; v->next = (Vehicle *)(size_t)_old_next_ptr;
if (_cargo_count != 0) { if (_cargo_count != 0) {
CargoPacket *cp = new CargoPacket((_cargo_source == 0xFF) ? INVALID_STATION : _cargo_source, _cargo_count); CargoPacket *cp = new CargoPacket((_cargo_source == 0xFF) ? INVALID_STATION : _cargo_source, _cargo_count);