summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2005-01-01 19:18:48 +0000
committertruelight <truelight@openttd.org>2005-01-01 19:18:48 +0000
commit25752eabfe6783042a77ef2654d21e23a57fe9c5 (patch)
tree59686070c954e13741ddcb01e6dd211038d3f3af
parentaacd9f7b0a81eae49b1c1093c387e089747117db (diff)
downloadopenttd-25752eabfe6783042a77ef2654d21e23a57fe9c5.tar.xz
(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
-rw-r--r--landscape.c4
-rw-r--r--ttd.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/landscape.c b/landscape.c
index 022f49557..f10e699ca 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 8ccf1f00a..479cc9132 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)
}