diff -r de9c1bd521c8 -r a42cafcba550 src/order_gui.cpp
--- a/src/order_gui.cpp	Tue Sep 09 11:26:17 2008 +0000
+++ b/src/order_gui.cpp	Tue Sep 09 12:26:25 2008 +0000
@@ -318,10 +318,9 @@
 	}
 
 	/* check waypoint */
-	if (IsTileType(tile, MP_RAILWAY) &&
+	if (IsRailWaypointTile(tile) &&
 			v->type == VEH_TRAIN &&
-			IsTileOwner(tile, _local_player) &&
-			IsRailWaypoint(tile)) {
+			IsTileOwner(tile, _local_player)) {
 		order.MakeGoToWaypoint(GetWaypointByTile(tile)->index);
 		if (_settings_client.gui.new_nonstop) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
 		return order;