From 5d065845453b47791afec27a373b9ff9728ead1e Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 1 Jan 2005 19:18:48 +0000 Subject: [PATCH] (svn r1321) -Fix: Revision 1302 partly solved the problem and created an other. Should now really be solved.. now only MP_WATER is owned by OWNER_WATER --- landscape.c | 4 ++-- ttd.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/landscape.c b/landscape.c index 022f495578..f10e699ca7 100644 --- a/landscape.c +++ b/landscape.c @@ -483,12 +483,12 @@ void InitializeLandscape() uint map_size = MapSize(); int i; - memset(_map_owner, OWNER_WATER, map_size); + memset(_map_owner, OWNER_NONE, map_size); memset(_map2, 0, map_size * sizeof(uint16)); 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); + memset(_map_type_and_height, MP_CLEAR << 4, map_size); for(i=0; i!=TILES_Y-1; i++) memset(_map_type_and_height + i*TILES_X, 0, TILES_X-1); diff --git a/ttd.c b/ttd.c index 8ccf1f00a9..479cc91325 100644 --- a/ttd.c +++ b/ttd.c @@ -1241,6 +1241,8 @@ bool AfterLoadGame(uint version) BEGIN_TILE_LOOP(tile_cur, w, h, tile) if (IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] != OWNER_WATER) _map_owner[tile_cur] = OWNER_WATER; + if (!IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] == OWNER_WATER) + _map_owner[tile_cur] = OWNER_NONE; END_TILE_LOOP(tile_cur, w, h, tile) }