(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, 142 insertions, 0 deletions

diff --git a/src/water_map.h b/src/water_map.h
new file mode 100644
index 000000000..db3308cbf
--- /dev/null
+++ b/src/water_map.h
@@ -0,0 +1,142 @@
+/* $Id$ */
+
+#ifndef WATER_MAP_H
+#define WATER_MAP_H
+
+typedef enum WaterTileType {
+	WATER_CLEAR,
+	WATER_COAST,
+	WATER_LOCK,
+	WATER_DEPOT,
+} WaterTileType;
+
+typedef enum DepotPart {
+	DEPOT_NORTH = 0x80,
+	DEPOT_SOUTH = 0x81,
+	DEPOT_END   = 0x84,
+} DepotPart;
+
+typedef enum LockPart {
+	LOCK_MIDDLE = 0x10,
+	LOCK_LOWER  = 0x14,
+	LOCK_UPPER  = 0x18,
+	LOCK_END    = 0x1C
+} LockPart;
+
+static inline WaterTileType GetWaterTileType(TileIndex t)
+{
+	if (_m[t].m5 == 0) return WATER_CLEAR;
+	if (_m[t].m5 == 1) return WATER_COAST;
+	if (IS_INT_INSIDE(_m[t].m5, LOCK_MIDDLE, LOCK_END)) return WATER_LOCK;
+
+	assert(IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END));
+	return WATER_DEPOT;
+}
+
+static inline bool IsWater(TileIndex t)
+{
+	return GetWaterTileType(t) == WATER_CLEAR;
+}
+
+static inline bool IsCoast(TileIndex t)
+{
+	return GetWaterTileType(t) == WATER_COAST;
+}
+
+static inline bool IsClearWaterTile(TileIndex t)
+{
+	return IsTileType(t, MP_WATER) && IsWater(t) && GetTileSlope(t, NULL) == SLOPE_FLAT;
+}
+
+static inline TileIndex GetOtherShipDepotTile(TileIndex t)
+{
+	return t + (HASBIT(_m[t].m5, 0) ? -1 : 1) * (HASBIT(_m[t].m5, 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0));
+}
+
+static inline TileIndex IsShipDepot(TileIndex t)
+{
+	return IS_INT_INSIDE(_m[t].m5, DEPOT_NORTH, DEPOT_END);
+}
+
+static inline Axis GetShipDepotAxis(TileIndex t)
+{
+	return (Axis)GB(_m[t].m5, 1, 1);
+}
+
+static inline DiagDirection GetShipDepotDirection(TileIndex t)
+{
+	return XYNSToDiagDir(GetShipDepotAxis(t), GB(_m[t].m5, 0, 1));
+}
+
+static inline DiagDirection GetLockDirection(TileIndex t)
+{
+	return (DiagDirection)GB(_m[t].m5, 0, 2);
+}
+
+static inline byte GetSection(TileIndex t)
+{
+	assert(GetWaterTileType(t) == WATER_LOCK || GetWaterTileType(t) == WATER_DEPOT);
+	return GB(_m[t].m5, 0, 4);
+}
+
+
+static inline void MakeWater(TileIndex t)
+{
+	SetTileType(t, MP_WATER);
+	SetTileOwner(t, OWNER_WATER);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = 0;
+}
+
+static inline void MakeShore(TileIndex t)
+{
+	SetTileType(t, MP_WATER);
+	SetTileOwner(t, OWNER_WATER);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = 1;
+}
+
+static inline void MakeCanal(TileIndex t, Owner o)
+{
+	SetTileType(t, MP_WATER);
+	SetTileOwner(t, o);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = 0;
+}
+
+static inline void MakeShipDepot(TileIndex t, Owner o, DepotPart base, Axis a)
+{
+	SetTileType(t, MP_WATER);
+	SetTileOwner(t, o);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = base + a * 2;
+}
+
+static inline void MakeLockTile(TileIndex t, Owner o, byte section)
+{
+	SetTileType(t, MP_WATER);
+	SetTileOwner(t, o);
+	_m[t].m2 = 0;
+	_m[t].m3 = 0;
+	_m[t].m4 = 0;
+	_m[t].m5 = section;
+}
+
+static inline void MakeLock(TileIndex t, Owner o, DiagDirection d)
+{
+	TileIndexDiff delta = TileOffsByDiagDir(d);
+
+	MakeLockTile(t, o, LOCK_MIDDLE + d);
+	MakeLockTile(t - delta, o, LOCK_LOWER + d);
+	MakeLockTile(t + delta, o, LOCK_UPPER + d);
+}
+
+#endif /* WATER_MAP_H */