# HG changeset patch # User truelight # Date 1112272758 0 # Node ID 108c0501019ed488a4f290c9face00374921ae51 # Parent 70a3c1a6576d3b8e7e50126d043ace3752fc95ae (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail diff -r 70a3c1a6576d -r 108c0501019e rail_cmd.c --- a/rail_cmd.c Wed Mar 30 19:52:26 2005 +0000 +++ b/rail_cmd.c Thu Mar 31 12:39:18 2005 +0000 @@ -1572,15 +1572,17 @@ SignalVehicleCheckStruct *dest = data; TileIndex tile; + if (v->type != VEH_Train) + return NULL; + /* Find the tile outside the tunnel, for signalling */ - if (v->u.rail.track == 0x40) { + if (v->u.rail.track == 0x40) tile = GetVehicleOutOfTunnelTile(v); - } else { + else tile = v->tile; - } /* Wrong tile, or no train? Not a match */ - if (tile != dest->tile || v->type != VEH_Train) + if (tile != dest->tile) return NULL; /* Are we on the same piece of track? */