dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12028) -Codechange: Split common part of station var 0x67, house var 0x62, indtile var 0x60 and industry var 0x62 to 'newgrf_commons.cpp'.

Browse Source
This commit is contained in:
frosch
2008-01-31 17:46:08 +00:00
parent ef35cefddc
commit fe9891c8ec
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_industrytiles.cpp
View File

@@ -45,16 +45,10 @@ static uint32 GetGRFParameter(IndustryGfx indtile_id, byte parameter)
*/
uint32 GetNearbyIndustryTileInformation(byte parameter, TileIndex tile, IndustryID index)
{
byte tile_type;
bool is_same_industry;
if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required
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);
bool is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index);
uint z;
Slope tileh = GetTileSlope(tile, &z);
return GetTileType(tile) << 24 | z << 16 | tile_type << 8 | tileh;
return GetNearbyTileInformation(tile) | (is_same_industry ? 1 : 0) << 8;
}
/** This is the position of the tile relative to the northernmost tile of the industry.