--- a/train_cmd.c	Thu Mar 24 15:15:06 2005 +0000
+++ b/train_cmd.c	Thu Mar 24 17:03:37 2005 +0000
@@ -15,6 +15,7 @@
 #include "player.h"
 #include "sound.h"
 #include "depot.h"
+#include "waypoint.h"
 
 #define is_firsthead_sprite(spritenum) \
 	(is_custom_sprite(spritenum) \
@@ -1916,7 +1917,7 @@
 			break;
 
 		case OT_GOTO_WAYPOINT:
-			v->dest_tile = _waypoints[order->station].xy;
+			v->dest_tile = GetWaypoint(order->station)->xy;
 			result = CheckReverseTrain(v);
 			break;
 	}