From 6eb094c72622b39bceff8293c3446e57d21c62f0 Mon Sep 17 00:00:00 2001 From: matthijs Date: Mon, 2 May 2005 23:59:11 +0000 Subject: (svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx) - Add: GetVehicleTrackdir() helper function. - Codechange: Moved SortStruct from vehicle_gui.h to ttd.h, so the dependency from vehicle.h on vehicle_gui.h could be removed. - Codechange: Typedeffed the VehicleTypes struct so it can be used as the type for Vehicle.type instead of "byte". - Codechange: Removed prototype for VehicleSorter(), which had no implementation anymore and was never called. --- roadveh_cmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'roadveh_cmd.c') diff --git a/roadveh_cmd.c b/roadveh_cmd.c index b349bd8cc..670af9f6a 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -15,6 +15,7 @@ #include "player.h" #include "sound.h" #include "depot.h" +#include "vehicle_gui.h" void ShowRoadVehViewWindow(Vehicle *v); @@ -316,7 +317,7 @@ static Depot *FindClosestRoadDepot(Vehicle *v) * v->direction won't contain anything usefule than */ trackdir = _dir_to_diag_trackdir[GetRoadStationDir(tile)]; else - trackdir = _dir_to_diag_trackdir[(v->direction>>1)&3]; + trackdir = GetVehicleTrackdir(v); ftd = NPFRouteToDepotBreadthFirst(v->tile, trackdir, TRANSPORT_ROAD, v->owner); if (ftd.best_bird_dist == 0) @@ -1160,7 +1161,8 @@ found_best_track:; static uint RoadFindPathToStation(const Vehicle *v, TileIndex tile) { NPFFindStationOrTileData fstd; - byte trackdir = _dir_to_diag_trackdir[(v->direction >> 1) & 3]; + byte trackdir = GetVehicleTrackdir(v); + assert(trackdir != 0xFF); fstd.dest_coords = tile; fstd.station_index = -1; // indicates that the destination is a tile, not a station -- cgit v1.2.3-54-g00ecf