petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r12386) -Fix [FS#1841](r2428): train could break apart when reversed while partially in a depot

Browse Source
This commit is contained in:
smatz
2008-03-19 20:50:19 +00:00
parent ab7542e912
commit ac4ec8c2d2
3 changed files with 93 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rail_cmd.cpp
View File

@@ -2230,6 +2230,29 @@ static const signed char _deltacoord_leaveoffset[8] = {
0, 1, 0, -1 /* y */
};
/** Compute number of ticks when next wagon will leave a depot.
* Negative means next wagon should have left depot n ticks before.
* @param v vehicle outside (leaving) the depot
* @return number of ticks when the next wagon will leave
*/
int TicksToLeaveDepot(const Vehicle *v)
{
DiagDirection dir = GetRailDepotDirection(v->tile);
int length = v->u.rail.cached_veh_length;
switch (dir) {
case DIAGDIR_NE: return ((int)(v->x_pos & 0x0F) - ((_fractcoords_enter[dir] & 0x0F) - (length + 1)));
case DIAGDIR_SE: return -((int)(v->y_pos & 0x0F) - ((_fractcoords_enter[dir] >> 4) + (length + 1)));
case DIAGDIR_SW: return -((int)(v->x_pos & 0x0F) - ((_fractcoords_enter[dir] & 0x0F) + (length + 1)));
default:
case DIAGDIR_NW: return ((int)(v->y_pos & 0x0F) - ((_fractcoords_enter[dir] >> 4) - (length + 1)));
}
return 0; // make compilers happy
}
static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *v, TileIndex tile, int x, int y)
{
byte fract_coord;