diff -r e96de3e61c9b -r e64bbd8598e2 depot.h --- a/depot.h Sun Jun 04 13:39:38 2006 +0000 +++ b/depot.h Sun Jun 04 16:04:15 2006 +0000 @@ -12,6 +12,7 @@ #include "road_map.h" #include "tile.h" #include "variables.h" +#include "water_map.h" struct Depot { TileIndex xy; @@ -98,20 +99,11 @@ { assert(IsTileDepotType(tile, type)); - switch (type) - { - case TRANSPORT_RAIL: return GetRailDepotDirection(tile); - case TRANSPORT_ROAD: return GetRoadDepotDirection(tile); - case TRANSPORT_WATER: - /* Water is stubborn, it stores the directions in a different order. */ - switch (GB(_m[tile].m5, 0, 2)) { - case 0: return DIAGDIR_NE; - case 1: return DIAGDIR_SW; - case 2: return DIAGDIR_NW; - case 3: return DIAGDIR_SE; - } - default: - return INVALID_DIAGDIR; /* Not reached */ + switch (type) { + case TRANSPORT_RAIL: return GetRailDepotDirection(tile); + case TRANSPORT_ROAD: return GetRoadDepotDirection(tile); + case TRANSPORT_WATER: return GetShipDepotDirection(tile); + default: return INVALID_DIAGDIR; /* Not reached */ } }