From 311c14c9f5815b85785b335c4dccefc0ea97a045 Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 13 Jan 2008 22:12:39 +0000 Subject: [PATCH] (svn r11843) -Fix: mark dirty canal tile even in diagonal direction from flooded tile --- src/direction_type.h | 4 ++++ src/water_cmd.cpp | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/direction_type.h b/src/direction_type.h index d1f8d89203..89b527cb67 100644 --- a/src/direction_type.h +++ b/src/direction_type.h @@ -30,6 +30,9 @@ enum Direction { INVALID_DIR = 0xFF, ///< Flag for an invalid direction }; +/** Allow incrementing of Direction variables */ +DECLARE_POSTFIX_INCREMENT(Direction); + /** Define basic enum properties */ template <> struct EnumPropsT : MakeEnumPropsT {}; typedef TinyEnumT DirectionByte; //typedefing-enumification of Direction @@ -77,6 +80,7 @@ enum DiagDirection { INVALID_DIAGDIR = 0xFF, ///< Flag for an invalid DiagDirection }; +/** Allow incrementing of DiagDirection variables */ DECLARE_POSTFIX_INCREMENT(DiagDirection); /** Define basic enum properties */ diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 119432abee..b9f2f348a4 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -644,10 +644,9 @@ static void TileLoopWaterHelper(TileIndex tile, const TileIndexDiffC *offs) MakeWater(target); MarkTileDirtyByTile(target); /* Mark surrounding canal tiles dirty too to avoid glitches */ - MarkTileDirtyIfCanal(target + TileDiffXY(0, 1)); - MarkTileDirtyIfCanal(target + TileDiffXY(1, 0)); - MarkTileDirtyIfCanal(target + TileDiffXY(0, -1)); - MarkTileDirtyIfCanal(target + TileDiffXY(-1, 0)); + for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) { + MarkTileDirtyIfCanal(target + TileOffsByDir(dir)); + } } } }