summaryrefslogtreecommitdiff
path: root/src/map_func.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map_func.h')
-rw-r--r--src/map_func.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map_func.h b/src/map_func.h
index 537b1f9a7..1deafc00c 100644
--- a/src/map_func.h
+++ b/src/map_func.h
@@ -297,10 +297,9 @@ static inline TileIndex AddTileIndexDiffCWrap(TileIndex tile, TileIndexDiffC dif
{
int x = TileX(tile) + diff.x;
int y = TileY(tile) + diff.y;
- if (x < 0 || y < 0 || x > (int)MapMaxX() || y > (int)MapMaxY())
- return INVALID_TILE;
- else
- return TileXY(x, y);
+ /* Negative value will become big positive value after cast */
+ if ((uint)x >= MapSizeX() || (uint)y >= MapSizeY()) return INVALID_TILE;
+ return TileXY(x, y);
}
/**