mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by 

OWNER_NONE instead of OWNER_WATER.
-Fix: On InitializeLandscape the map was made MP_WATER, but OWNER_NONE. 
 When ConvertGroundTilesIntoWaterTiles() is not called, this gives big 
 problems (see above). Now the owner is set to OWNER_WATER by default.
This commit is contained in:
truelight 2004-12-30 10:29:28 +00:00
parent 546fcfa3ec
commit 4b38004a49
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
landscape.c
View File

@ -483,7 +483,7 @@ void InitializeLandscape()
uint map_size = MapSize();
int i;
memset(_map_owner, OWNER_NONE, map_size);
memset(_map_owner, OWNER_WATER, map_size);
memset(_map2, 0, map_size * sizeof(uint16));
memset(_map3_lo, 0, map_size);
memset(_map3_hi, 0, map_size);

15
ttd.c
View File

@ -1229,6 +1229,21 @@ bool AfterLoadGame(uint version)
UpdateCurrencies();
}
/* In old version there seems to be a problem that water is owned by
OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current
(0x402) version, so I just check when versions are older, and then
walk through the whole map.. */
if (version <= 0x402) {
TileIndex tile = TILE_XY(0,0);
uint w = MapSizeX();
uint h = MapSizeY();
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;
END_TILE_LOOP(tile_cur, w, h, tile)
}
// convert road side to my format.
if (_opt.road_side) _opt.road_side = 1;