(svn r10904) -Fix: When using a temporary industry, make sure you do not clear some unreachable tiles upon its destruction.

-Codechange: do not perform something that by all means will not change. A zero offset is really meaningless...
This commit is contained in:
belugas
2007-08-15 01:50:13 +00:00
parent f48e05ec73
commit e9f06607d1

View File

@@ -35,7 +35,7 @@ uint32 GetNearbyIndustryTileInformation(byte parameter, TileIndex tile, Industry
byte tile_type; byte tile_type;
bool is_same_industry; bool is_same_industry;
tile = GetNearbyTile(parameter, tile); if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required
is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index); is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index);
tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1 | (is_same_industry ? 1 : 0); tile_type = GetTerrainType(tile) << 2 | (IsTileType(tile, MP_WATER) ? 1 : 0) << 1 | (is_same_industry ? 1 : 0);
@@ -236,6 +236,7 @@ bool PerformIndustryTileSlopeCheck(TileIndex tile, const IndustryTileSpec *its,
{ {
Industry ind; Industry ind;
ind.xy = 0; ind.xy = 0;
ind.width = 0;
ind.type = type; ind.type = type;
uint16 callback_res = GetIndustryTileCallback(CBID_INDTILE_SHAPE_CHECK, 0, 0, gfx, &ind, tile); uint16 callback_res = GetIndustryTileCallback(CBID_INDTILE_SHAPE_CHECK, 0, 0, gfx, &ind, tile);