--- a/rail_map.h	Thu Aug 31 08:11:08 2006 +0000
+++ b/rail_map.h	Thu Aug 31 08:16:28 2006 +0000
@@ -137,7 +137,7 @@
 
 static inline Axis GetWaypointAxis(TileIndex t)
 {
-	return HASBIT(_m[t].m5, 0) ? AXIS_Y : AXIS_X;
+	return (Axis)GB(_m[t].m5, 0, 1);
 }
 
 static inline Track GetRailWaypointTrack(TileIndex t)