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

(svn r10735) [0.5] -Fix [FS#1062]: trains being split into two pieces when loading an old savegame.

release/0.5
rubidium 2007-07-30 10:24:04 +00:00
parent 4ecd0b659d
commit 13259028b1
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oldloader.c
View File

@ -357,21 +357,6 @@ static void FixOldVehicles(void)
break; break;
} }
} }
if (IsBridgeTile(v->tile) && IsBridgeRamp(v->tile) &&
(v->z_pos & (TILE_HEIGHT - 1)) == (TILE_HEIGHT - 1)) {
/* Under some circumstances the trains going up a ramp can be one
* pixel too low when they enter the bridge. This causes the train
* to "disappear" under the bridge, which causes the train to
* break into two pieces and crash slightly later.
*
* This "hack" will make the trains on those positions on the
* ramps run one pixel higher. This offset will be automatically
* "fixed" when it enters the bridge middle parts or when it
* drives down the ramp of the bridge.
*/
v->z_pos++;
}
} }
} }

20
openttd.c
View File

@ -1592,6 +1592,26 @@ bool AfterLoadGame(void)
SettingsDisableElrail(_patches.disable_elrails); SettingsDisableElrail(_patches.disable_elrails);
} }
if (CheckSavegameVersion(41)) {
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (IsBridgeTile(v->tile) && IsBridgeRamp(v->tile) &&
(v->z_pos & (TILE_HEIGHT - 1)) == (TILE_HEIGHT - 1)) {
/* Under some circumstances the trains going up a ramp can be one
* pixel too low when they enter the bridge. This causes the train
* to "disappear" under the bridge, which causes the train to
* break into two pieces and crash slightly later.
*
* This "hack" will make the trains on those positions on the
* ramps run one pixel higher. This offset will be automatically
* "fixed" when it enters the bridge middle parts or when it
* drives down the ramp of the bridge.
*/
v->z_pos++;
}
}
}
/* Buoys do now store the owner of the previous water tile, which can never /* Buoys do now store the owner of the previous water tile, which can never
* be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */ * be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */
if (CheckSavegameVersion(46)) { if (CheckSavegameVersion(46)) {