# HG changeset patch # User dominik # Date 1105101208 0 # Node ID f5fb2d73ca12f0dd37f7d6d179e47b406255f586 # Parent 433faaf547c19a47fd7989b431e86425f3e0b92b (svn r1413) Fixed a serious memory leak problem. The invisible tiles on the southern border now have the correct tile type (MP_VOID) again. Please note that older maps might still have incorrect border tiles, thus still causing overflows. diff -r 433faaf547c1 -r f5fb2d73ca12 landscape.c --- a/landscape.c Fri Jan 07 09:51:16 2005 +0000 +++ b/landscape.c Fri Jan 07 12:33:28 2005 +0000 @@ -84,7 +84,7 @@ { if (GET_TILE_X(tile) == MapMaxX() || GET_TILE_Y(tile) == MapMaxY()) { ti->tileh = 0; - ti->type = MP_STRANGE; + ti->type = MP_VOID; ti->tile = 0; ti->map5 = 0; ti->z = 0; @@ -108,7 +108,7 @@ if (x >= MapMaxX() * 16 - 1 || y >= MapMaxY() * 16 - 1) { ti->tileh = 0; - ti->type = MP_STRANGE; + ti->type = MP_VOID; ti->tile = 0; ti->map5 = 0; ti->z = 0; @@ -495,8 +495,10 @@ memset(_map_extra_bits, 0, map_size / 4); memset(_map_type_and_height, MP_CLEAR << 4, map_size); + // create void tiles on the border for (i = 0; i != MapMaxY(); i++) - memset(_map_type_and_height + i * MapSizeX(), 0, MapSizeX() - 1); + _map_type_and_height[ i * MapSizeX() + MapMaxY() ] = MP_VOID << 4; + memset(_map_type_and_height + MapMaxY() * MapSizeX(), MP_VOID << 4, MapSizeX()); memset(_map5, 3, map_size); } diff -r 433faaf547c1 -r f5fb2d73ca12 ttd.h --- a/ttd.h Fri Jan 07 09:51:16 2005 +0000 +++ b/ttd.h Fri Jan 07 12:33:28 2005 +0000 @@ -91,7 +91,7 @@ MP_TREES, MP_STATION, MP_WATER, - MP_STRANGE, + MP_VOID, // invisible tiles at the SW and SE border MP_INDUSTRY, MP_TUNNELBRIDGE, MP_UNMOVABLE