diff options
| author | tron <tron@openttd.org> | 2004-12-17 09:01:24 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-12-17 09:01:24 +0000 |
| commit | 6318ba95981fbf2eba322cb3834f3ffb5903b159 (patch) | |
| tree | 07cf8daec8c557712366528e29d4b19e4d668c54 /landscape.c | |
| parent | d2ce1519578a0e71ddeef7efac53a78621ff92cb (diff) | |
| download | openttd-6318ba95981fbf2eba322cb3834f3ffb5903b159.tar.xz | |
(svn r1144) Don't rely on sizeof() to determine the map size, use MapSize() instead
Diffstat (limited to 'landscape.c')
| -rw-r--r-- | landscape.c | 15 |
1 files changed, 8 insertions, 7 deletions
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() |