--- a/src/water_cmd.cpp	Thu Jan 11 13:41:16 2007 +0000
+++ b/src/water_cmd.cpp	Mon Jan 15 20:14:06 2007 +0000
@@ -83,8 +83,8 @@
 		depot->xy = tile;
 		depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 
-		MakeShipDepot(tile,_current_player, DEPOT_NORTH, p1);
-		MakeShipDepot(tile2,_current_player, DEPOT_SOUTH, p1);
+		MakeShipDepot(tile, _current_player, DEPOT_NORTH, (Axis)p1);
+		MakeShipDepot(tile2, _current_player, DEPOT_SOUTH, (Axis)p1);
 		MarkTileDirtyByTile(tile);
 		MarkTileDirtyByTile(tile2);
 	}
@@ -471,7 +471,7 @@
 static uint GetSlopeZ_Water(TileIndex tile, uint x, uint y)
 {
 	uint z;
-	uint tileh = GetTileSlope(tile, &z);
+	Slope tileh = GetTileSlope(tile, &z);
 
 	return z + GetPartialZ(x & 0xF, y & 0xF, tileh);
 }
@@ -673,7 +673,7 @@
 
 	switch (GetWaterTileType(tile)) {
 		case WATER_CLEAR: ts = TRACK_BIT_ALL; break;
-		case WATER_COAST: ts = coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break;
+		case WATER_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break;
 		case WATER_LOCK:  ts = AxisToTrackBits(DiagDirToAxis(GetLockDirection(tile))); break;
 		case WATER_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break;
 		default: return 0;
@@ -715,7 +715,7 @@
 }
 
 
-const TileTypeProcs _tile_type_water_procs = {
+extern const TileTypeProcs _tile_type_water_procs = {
 	DrawTile_Water,           /* draw_tile_proc */
 	GetSlopeZ_Water,          /* get_slope_z_proc */
 	ClearTile_Water,          /* clear_tile_proc */