Mercurial > hg > openttd
changeset 8525:433c2575e919 draft
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Sun, 10 Feb 2008 14:00:52 +0000 |
| parents | e3ded1960183 |
| children | 86f56ca84f4d |
| files | src/openttd.cpp src/water_cmd.cpp |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -2364,6 +2364,12 @@ 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())) { + /* 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); + } + if (IsBuoyTile(t) || IsDriveThroughStopTile(t) || IsTileType(t, MP_WATER)) { Owner o = GetTileOwner(t); if (IsValidPlayer(o) && !GetPlayer(o)->is_active) {
--- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -111,6 +111,12 @@ /* Mark tile dirty in all cases */ MarkTileDirtyByTile(t); + if (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() || TileY(t) == MapMaxY()) { + /* tiles at map borders are always WATER_CLASS_SEA */ + SetWaterClass(t, WATER_CLASS_SEA); + return; + } + bool has_water = false; bool has_canal = false; bool has_river = false;