Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21259) -Change: [NewGRF] Split var43 into var43 (animation stage) and var47 (object colour)

Browse Source
This commit is contained in:
rubidium 2010-11-19 19:25:35 +00:00
parent 0c6810eebe
commit 8ba6d25db6
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/newgrf_object.cpp
View File

@ -146,16 +146,6 @@ static uint32 GetNearbyObjectTileInformation(byte parameter, TileIndex tile, Obj
return GetNearbyTileInformation(tile) | (is_same_object ? 1 : 0) << 8;
}
/**
* Get the object's animation counter data.
* @param tile The tile to query.
* @return The object's data.
*/
static uint32 GetObjectAnimationCounter(TileIndex tile)
{
return Object::GetByTile(tile)->colour << 8 | GetAnimationFrame(tile);
}
/**
* Get the closest object of a given type.
* @param tile The tile to start searching from.
@ -252,6 +242,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
* Disallow the rest:
* 0x40: Relative position is passed as parameter during construction.
* 0x43: Animation counter is only for actual tiles.
* 0x47: Object colour is only valid when its built.
* 0x63: Animation counter of nearby tile, see above.
*/
default:
@ -280,7 +271,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
case 0x42: return o->build_date;
/* Animation counter */
case 0x43: return GetObjectAnimationCounter(tile);
case 0x43: return GetAnimationFrame(tile);
/* Object founder information */
case 0x44: return GetTileOwner(tile);
@ -291,6 +282,9 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
/* Get square of Euclidian distance of closes town */
case 0x46: return GetTownRadiusGroup(t, tile) << 16 | min(DistanceSquare(tile, t->xy), 0xFFFF);
/* Object colour */
case 0x47: return o->colour;
/* Get object ID at offset param */
case 0x60: return GetObjectIDAtOffset(GetNearbyTile(parameter, tile), object->grffile->grfid);
@ -305,7 +299,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt
/* Animation counter of nearby tile */
case 0x63:
tile = GetNearbyTile(parameter, tile);
return (IsTileType(tile, MP_OBJECT) && Object::GetByTile(tile) == o) ? GetObjectAnimationCounter(tile) : 0;
return (IsTileType(tile, MP_OBJECT) && Object::GetByTile(tile) == o) ? GetAnimationFrame(tile) : 0;
/* Count of object, distance of closest instance */
case 0x64: return GetCountAndDistanceOfClosestInstance(parameter, object->grffile->grfid, tile, o);