--- a/order_gui.c	Sun Mar 19 13:44:11 2006 +0000
+++ b/order_gui.c	Sun Mar 19 13:48:08 2006 +0000
@@ -197,7 +197,8 @@
 		switch (GetTileType(tile)) {
 		case MP_RAILWAY:
 			if (v->type == VEH_Train && IsTileOwner(tile, _local_player)) {
-				if ((_m[tile].m5&0xFC)==0xC0) {
+				if (GetRailTileType(tile) == RAIL_TYPE_DEPOT_WAYPOINT &&
+						GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) {
 					order.type = OT_GOTO_DEPOT;
 					order.flags = OF_PART_OF_ORDERS;
 					order.station = GetDepotByTile(tile)->index;