--- a/train_cmd.c	Sun Mar 12 12:19:25 2006 +0000
+++ b/train_cmd.c	Sun Mar 12 15:04:03 2006 +0000
@@ -2481,8 +2481,9 @@
 			TileIndex tile = TileVirtXY(v->x_pos, v->y_pos);
 
 			// XXX workaround, whole UP/DOWN detection needs overhaul
-			if (!IsTileType(tile, MP_TUNNELBRIDGE) || (_m[tile].m5 & 0x80) != 0)
+			if (!IsTunnelTile(tile)) {
 				SETBIT(v->u.rail.flags, (new_z > old_z) ? VRF_GOINGUP : VRF_GOINGDOWN);
+			}
 		}
 	}