diff options
| author | frosch <frosch@openttd.org> | 2011-11-08 17:29:01 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-11-08 17:29:01 +0000 |
| commit | 8f4c6d42f90dc6bda68c803bebec48a9382eb675 (patch) | |
| tree | b2c9b3e4e53cfcb2433ea5acb4553c7516ae2d0a /src/newgrf_industrytiles.cpp | |
| parent | 5aaecae6e2ea2c2236375274439645e669081328 (diff) | |
| download | openttd-8f4c6d42f90dc6bda68c803bebec48a9382eb675.tar.xz | |
(svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium)
Diffstat (limited to 'src/newgrf_industrytiles.cpp')
| -rw-r--r-- | src/newgrf_industrytiles.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index 0014a0bd8..bf5859864 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -32,14 +32,15 @@ * @param tile TileIndex from which the callback was initiated * @param index of the industry been queried for * @param signed_offsets Are the x and y offset encoded in parameter signed? + * @param grf_version8 True, if we are dealing with a new NewGRF which uses GRF version >= 8. * @return a construction of bits obeying the newgrf format */ -uint32 GetNearbyIndustryTileInformation(byte parameter, TileIndex tile, IndustryID index, bool signed_offsets) +uint32 GetNearbyIndustryTileInformation(byte parameter, TileIndex tile, IndustryID index, bool signed_offsets, bool grf_version8) { if (parameter != 0) tile = GetNearbyTile(parameter, tile, signed_offsets); // only perform if it is required bool is_same_industry = (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == index); - return GetNearbyTileInformation(tile) | (is_same_industry ? 1 : 0) << 8; + return GetNearbyTileInformation(tile, grf_version8) | (is_same_industry ? 1 : 0) << 8; } /** @@ -87,7 +88,7 @@ static uint32 IndustryTileGetVariable(const ResolverObject *object, byte variabl case 0x44: return (IsTileType(tile, MP_INDUSTRY)) ? GetAnimationFrame(tile) : 0; /* Land info of nearby tiles */ - case 0x60: return GetNearbyIndustryTileInformation(parameter, tile, inds == NULL ? (IndustryID)INVALID_INDUSTRY : inds->index); + case 0x60: return GetNearbyIndustryTileInformation(parameter, tile, inds == NULL ? (IndustryID)INVALID_INDUSTRY : inds->index, true, object->grffile->grf_version >= 8); /* Animation stage of nearby tiles */ case 0x61: |