From 6318ba95981fbf2eba322cb3834f3ffb5903b159 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 17 Dec 2004 09:01:24 +0000 Subject: (svn r1144) Don't rely on sizeof() to determine the map size, use MapSize() instead --- landscape.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'landscape.c') diff --git a/landscape.c b/landscape.c index 78da7197f..28fca9648 100644 --- a/landscape.c +++ b/landscape.c @@ -480,19 +480,20 @@ void RunTileLoop() void InitializeLandscape() { + uint map_size = MapSize(); int i; - memset(_map_owner, OWNER_NONE, sizeof(_map_owner)); - memset(_map2, 0, sizeof(_map2)); - memset(_map3_lo, 0, sizeof(_map3_lo)); - memset(_map3_hi, 0, sizeof(_map3_hi)); - memset(_map_extra_bits, 0, sizeof(_map_extra_bits)); - memset(_map_type_and_height, MP_WATER << 4, sizeof(_map_type_and_height)); + memset(_map_owner, OWNER_NONE, map_size); + memset(_map2, 0, map_size); + memset(_map3_lo, 0, map_size); + memset(_map3_hi, 0, map_size); + memset(_map_extra_bits, 0, map_size / 4); + memset(_map_type_and_height, MP_WATER << 4, map_size); for(i=0; i!=TILES_Y-1; i++) memset(_map_type_and_height + i*TILES_X, 0, TILES_X-1); - memset(_map5, 3, sizeof(_map5)); + memset(_map5, 3, map_size); } void ConvertGroundTilesIntoWaterTiles() -- cgit v1.2.3-54-g00ecf