summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-06-05 08:34:39 +0000
committertron <tron@openttd.org>2006-06-05 08:34:39 +0000
commit4f5c84e720d3c8e746c155cfdbb622b3bec53a15 (patch)
tree4bf9ebf5facb477852c0544d3fcef98482c2051d
parent5e3dd8dd7852e2b4e5ae48eebc7472e73d1f7009 (diff)
downloadopenttd-4f5c84e720d3c8e746c155cfdbb622b3bec53a15.tar.xz
(svn r5116) Move the overly generic GetDepotDirection() from a header to its only consumer
-rw-r--r--depot.h17
-rw-r--r--npf.c18
-rw-r--r--vehicle.c2
3 files changed, 20 insertions, 17 deletions
diff --git a/depot.h b/depot.h
index cf8b00bc7..bfd71b2b5 100644
--- a/depot.h
+++ b/depot.h
@@ -8,11 +8,8 @@
#include "direction.h"
#include "pool.h"
-#include "rail_map.h"
-#include "road_map.h"
#include "tile.h"
#include "variables.h"
-#include "water_map.h"
struct Depot {
TileIndex xy;
@@ -92,20 +89,6 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type)
}
}
-/**
- * Returns the direction the exit of the depot on the given tile is facing.
- */
-static inline DiagDirection GetDepotDirection(TileIndex tile, TransportType type)
-{
- assert(IsTileDepotType(tile, type));
-
- 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 */
- }
-}
/**
Find out if the slope of the tile is suitable to build a depot of given direction
diff --git a/npf.c b/npf.c
index 346405ef0..9e41f76f7 100644
--- a/npf.c
+++ b/npf.c
@@ -15,6 +15,7 @@
#include "depot.h"
#include "tunnel_map.h"
#include "network.h"
+#include "water_map.h"
static AyStar _npf_aystar;
@@ -491,6 +492,23 @@ static bool VehicleMayEnterTile(Owner owner, TileIndex tile, DiagDirection enter
return true; /* no need to check */
}
+
+/**
+ * Returns the direction the exit of the depot on the given tile is facing.
+ */
+static DiagDirection GetDepotDirection(TileIndex tile, TransportType type)
+{
+ assert(IsTileDepotType(tile, type));
+
+ 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 */
+ }
+}
+
+
/* Will just follow the results of GetTileTrackStatus concerning where we can
* go and where not. Uses AyStar.user_data[NPF_TYPE] as the transport type and
* an argument to GetTileTrackStatus. Will skip tunnels, meaning that the
diff --git a/vehicle.c b/vehicle.c
index ea5638273..40bc6ac41 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -2,6 +2,7 @@
#include "stdafx.h"
#include "openttd.h"
+#include "road_map.h"
#include "spritecache.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -25,6 +26,7 @@
#include "train.h"
#include "industry_map.h"
#include "station_map.h"
+#include "water_map.h"
#define INVALID_COORD (-0x8000)
#define GEN_HASH(x,y) (((x & 0x1F80)>>7) + ((y & 0xFC0)))