From e075cf550033b68dbfba0c60988943e23a252ccc Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Sun, 10 Feb 2008 14:16:25 +0000
Subject: [PATCH] (svn r12101) -Fix (r12100): there are void tiles at MapMaxX,Y
 - have to substract one to be on water border tiles

---
 src/openttd.cpp   | 2 +-
 src/water_cmd.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 98a24d6131..3e86992b0a 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -2364,7 +2364,7 @@ bool AfterLoadGame()
 
 	if (CheckSavegameVersion(87)) {
 		for (TileIndex t = 0; t < map_size; t++) {
-			if (!IsTileType(t, MP_VOID) && (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() || TileY(t) == MapMaxY())) {
+			if (!IsTileType(t, MP_VOID) && (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() - 1 || TileY(t) == MapMaxY() - 1)) {
 				/* Some version 86 savegames have wrong water class at map borders (under buoy, or after removing buoy).
 				 * This conversion has to be done before buoys with invalid owner are removed. */
 				SetWaterClass(t, WATER_CLASS_SEA);
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 35864cf83b..56da843b3a 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -111,7 +111,7 @@ void SetWaterClassDependingOnSurroundings(TileIndex t)
 	/* Mark tile dirty in all cases */
 	MarkTileDirtyByTile(t);
 
-	if (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() || TileY(t) == MapMaxY()) {
+	if (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() - 1 || TileY(t) == MapMaxY() - 1) {
 		/* tiles at map borders are always WATER_CLASS_SEA */
 		SetWaterClass(t, WATER_CLASS_SEA);
 		return;