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

(svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail

release/0.4.5
truelight 2005-03-31 12:39:18 +00:00
parent 66989faab6
commit c6f56edcff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rail_cmd.c
View File

@ -1572,15 +1572,17 @@ static void *SignalVehicleCheckProc(Vehicle *v, void *data)
SignalVehicleCheckStruct *dest = data; SignalVehicleCheckStruct *dest = data;
TileIndex tile; TileIndex tile;
if (v->type != VEH_Train)
return NULL;
/* Find the tile outside the tunnel, for signalling */ /* Find the tile outside the tunnel, for signalling */
if (v->u.rail.track == 0x40) { if (v->u.rail.track == 0x40)
tile = GetVehicleOutOfTunnelTile(v); tile = GetVehicleOutOfTunnelTile(v);
} else { else
tile = v->tile; tile = v->tile;
}
/* Wrong tile, or no train? Not a match */ /* Wrong tile, or no train? Not a match */
if (tile != dest->tile || v->type != VEH_Train) if (tile != dest->tile)
return NULL; return NULL;
/* Are we on the same piece of track? */ /* Are we on the same piece of track? */