From e95a85315ce8aeb40b1dd28cf6f5607032be9a7b Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Wed, 20 Feb 2008 16:24:56 +0000
Subject: (svn r12195) -Fix [FS#1787](r12100): there can be oil rigs at map
 borders, do not set water class for them

---
 src/openttd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 28da4c2dd..7f8df22d4 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -2364,7 +2364,9 @@ 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() - 1 || TileY(t) == MapMaxY() - 1)) {
+			/* skip oil rigs at borders! */
+			if ((IsTileType(t, MP_WATER) || IsBuoyTile(t)) &&
+					(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);
-- 
cgit v1.2.3-54-g00ecf