--- a/src/waypoint.h	Sat Mar 03 20:33:32 2007 +0000
+++ b/src/waypoint.h	Sun Mar 04 04:25:36 2007 +0000
@@ -59,7 +59,7 @@
 static inline Waypoint *GetWaypointByTile(TileIndex tile)
 {
 	assert(IsTileType(tile, MP_RAILWAY) && IsRailWaypoint(tile));
-	return GetWaypoint(_m[tile].m2);
+	return GetWaypoint(GetWaypointIndex(tile));
 }
 
 int32 RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove);