From 662a0a9cd31111f9507e6d0706c3d5e9b7a425cc Mon Sep 17 00:00:00 2001 From: michi_cc Date: Thu, 7 Jul 2011 14:16:16 +0000 Subject: (svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water. --- src/water_map.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/water_map.h') diff --git a/src/water_map.h b/src/water_map.h index d26b93210..02838a684 100644 --- a/src/water_map.h +++ b/src/water_map.h @@ -421,8 +421,10 @@ static inline void MakeLock(TileIndex t, Owner o, DiagDirection d, WaterClass wc TileIndexDiff delta = TileOffsByDiagDir(d); MakeLockTile(t, o, LOCK_MIDDLE + d, WATER_CLASS_CANAL); - MakeLockTile(t - delta, o, LOCK_LOWER + d, wc_lower); - MakeLockTile(t + delta, o, LOCK_UPPER + d, wc_upper); + /* Keep the current owner for the upper and lower part if it is a + * water tile so we can restore the owner after deleting the lock. */ + MakeLockTile(t - delta, IsWaterTile(t - delta) ? GetTileOwner(t - delta) : o, LOCK_LOWER + d, wc_lower); + MakeLockTile(t + delta, IsWaterTile(t + delta) ? GetTileOwner(t + delta) : o, LOCK_UPPER + d, wc_upper); } #endif /* WATER_MAP_H */ -- cgit v1.2.3-54-g00ecf