mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20754) -Fix [FS#4112]: assert when an industry previously build on water was flooded because it's grf changed/is missing

release/1.1
yexo 2010-09-06 15:23:16 +00:00
parent fd54943c7a
commit 8cc43828e8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/industry_cmd.cpp
View File

@ -785,6 +785,12 @@ static void TileLoop_Industry(TileIndex tile)
{ {
if (IsTileOnWater(tile)) TileLoop_Water(tile); if (IsTileOnWater(tile)) TileLoop_Water(tile);
/* Normally this doesn't happen, but if an industry NewGRF is removed
* an industry that was previously build on water can now be flooded.
* If this happens the tile is no longer an industry tile after
* returning from TileLoop_Water. */
if (!IsTileType(tile, MP_INDUSTRY)) return;
TriggerIndustryTile(tile, INDTILE_TRIGGER_TILE_LOOP); TriggerIndustryTile(tile, INDTILE_TRIGGER_TILE_LOOP);
if (!IsIndustryCompleted(tile)) { if (!IsIndustryCompleted(tile)) {