From 90ee6a16ab499135691fc0be395555d69e0c620e Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 31 Jan 2008 17:46:08 +0000 Subject: (svn r12028) -Codechange: Split common part of station var 0x67, house var 0x62, indtile var 0x60 and industry var 0x62 to 'newgrf_commons.cpp'. --- src/newgrf_industrytiles.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/newgrf_industrytiles.cpp') diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index fcf4105bc..0a964d115 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -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. -- cgit v1.2.3-54-g00ecf