(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 54 insertions, 0 deletions

diff --git a/src/road_map.c b/src/road_map.c
new file mode 100644
index 000000000..cccd2e76a
--- /dev/null
+++ b/src/road_map.c
@@ -0,0 +1,54 @@
+/* $Id$ */
+
+#include "stdafx.h"
+#include "openttd.h"
+#include "bridge_map.h"
+#include "functions.h"
+#include "road_map.h"
+#include "station.h"
+#include "tunnel_map.h"
+#include "station_map.h"
+#include "depot.h"
+
+
+RoadBits GetAnyRoadBits(TileIndex tile)
+{
+	switch (GetTileType(tile)) {
+		case MP_STREET:
+			switch (GetRoadTileType(tile)) {
+				default:
+				case ROAD_TILE_NORMAL:   return GetRoadBits(tile);
+				case ROAD_TILE_CROSSING: return GetCrossingRoadBits(tile);
+				case ROAD_TILE_DEPOT:    return DiagDirToRoadBits(GetRoadDepotDirection(tile));
+			}
+
+		case MP_STATION:
+			if (!IsRoadStopTile(tile)) return 0;
+			return DiagDirToRoadBits(GetRoadStopDir(tile));
+
+		case MP_TUNNELBRIDGE:
+			if (IsTunnel(tile)) {
+				if (GetTunnelTransportType(tile) != TRANSPORT_ROAD) return 0;
+				return DiagDirToRoadBits(ReverseDiagDir(GetTunnelDirection(tile)));
+			} else {
+				if (GetBridgeTransportType(tile) != TRANSPORT_ROAD) return 0;
+				return DiagDirToRoadBits(ReverseDiagDir(GetBridgeRampDirection(tile)));
+			}
+
+		default: return 0;
+	}
+}
+
+
+TrackBits GetAnyRoadTrackBits(TileIndex tile)
+{
+	uint32 r;
+
+	// Don't allow local authorities to build roads through road depots or road stops.
+	if ((IsTileType(tile, MP_STREET) && IsTileDepotType(tile, TRANSPORT_ROAD)) || IsTileType(tile, MP_STATION)) {
+		return 0;
+	}
+
+	r = GetTileTrackStatus(tile, TRANSPORT_ROAD);
+	return (byte)(r | (r >> 8));
+}