cpp/openttd-patchpack/source Changeset - r17837:22979fffdedd

Changeset - r17837:22979fffdedd

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 13 years ago 2011-07-07 14:16:16
michi_cc@openttd.org

(svn r22638) -Fix: Keep the previous owner of the upper and lower lock parts if they are built on existing water.

2 files changed with 6 insertions and 4 deletions:

src/water_cmd.cpp

src/water_map.h

0 comments (0 inline, 0 general)

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -279,8 +279,8 @@ static CommandCost RemoveLock(TileIndex @@
 	if (flags & DC_EXEC) {
 		DoClearSquare(tile);
 		MakeWaterKeepingClass(tile + delta, GetTileOwner(tile));
 		MakeWaterKeepingClass(tile - delta, GetTileOwner(tile));
 		MakeWaterKeepingClass(tile + delta, GetTileOwner(tile + delta));
 		MakeWaterKeepingClass(tile - delta, GetTileOwner(tile - delta));
 		MarkCanalsAndRiversAroundDirty(tile - delta);
 		MarkCanalsAndRiversAroundDirty(tile + delta);
+	}

src/water_map.h

➞

Show inline comments

@@ @@ -421,8 +421,10 @@ static inline void MakeLock(TileIndex t, @@
 	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 */

0 comments (0 inline, 0 general)