(svn r1332) -Fix: Desert-landscape does no longer crash (protected GetMapExtraBits

from overflowing)
20 years ago · a39f1b895a
parent a8b727e9c3
commit a39f1b895a
1 changed files with 5 additions and 1 deletions
--- a/landscape.c
+++ b/landscape.c
@ -444,7 +444,11 @@ void SetMapExtraBits(uint tile, byte bits)

 uint GetMapExtraBits(uint tile)
 {
-	return (_map_extra_bits[tile >> 2] >> (tile&3)*2)&3;
+	if (GET_TILE_X(tile) < MapSizeX() && GET_TILE_Y(tile) < MapSizeY() &&
+			GET_TILE_X(tile) > 0 && GET_TILE_Y(tile) > 0)
+		return (_map_extra_bits[tile >> 2] >> (tile&3)*2)&3;
+	else
+		return 0;
 }

 #define TILELOOP_BITS 4