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_object.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_object.cpp')
| -rw-r--r-- | src/newgrf_object.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index 285570c1b..991580acd 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -157,14 +157,15 @@ static uint32 GetObjectIDAtOffset(TileIndex tile, uint32 cur_grfid) * @param parameter from callback. It's in fact a pair of coordinates * @param tile TileIndex from which the callback was initiated * @param index of the object been queried for + * @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 */ -static uint32 GetNearbyObjectTileInformation(byte parameter, TileIndex tile, ObjectID index) +static uint32 GetNearbyObjectTileInformation(byte parameter, TileIndex tile, ObjectID index, bool grf_version8) { if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required bool is_same_object = (IsTileType(tile, MP_OBJECT) && GetObjectIndex(tile) == index); - return GetNearbyTileInformation(tile) | (is_same_object ? 1 : 0) << 8; + return GetNearbyTileInformation(tile, grf_version8) | (is_same_object ? 1 : 0) << 8; } /** @@ -321,7 +322,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, uin return (IsTileType(tile, MP_OBJECT) && Object::GetByTile(tile) == o) ? GetObjectRandomBits(tile) : 0; /* Land info of nearby tiles */ - case 0x62: return GetNearbyObjectTileInformation(parameter, tile, o == NULL ? INVALID_OBJECT : o->index); + case 0x62: return GetNearbyObjectTileInformation(parameter, tile, o == NULL ? INVALID_OBJECT : o->index, object->grffile->grf_version >= 8); /* Animation counter of nearby tile */ case 0x63: |