(svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame

This commit is contained in:
rubidium
2010-08-26 14:45:45 +00:00
parent 7f86dcca90
commit 4efa2efdbb
14 changed files with 83 additions and 154 deletions

View File

@@ -139,30 +139,6 @@ static inline void SetLiftPosition(TileIndex t, byte pos)
SB(_m[t].m6, 2, 6, pos);
}
/**
* Get the current animation frame for this house
* @param t the tile
* @pre IsTileType(t, MP_HOUSE)
* @return frame number
*/
static inline byte GetHouseAnimationFrame(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
return _me[t].m7;
}
/**
* Set a new animation frame for this house
* @param t the tile
* @param frame the new frame number
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void SetHouseAnimationFrame(TileIndex t, byte frame)
{
assert(IsTileType(t, MP_HOUSE));
_me[t].m7 = frame;
}
/**
* Get the completion of this house
* @param t the tile
@@ -386,7 +362,7 @@ static inline void MakeHouseTile(TileIndex t, TownID tid, byte counter, byte sta
SetHouseType(t, type);
SetHouseCompleted(t, stage == TOWN_HOUSE_COMPLETED);
_m[t].m5 = IsHouseCompleted(t) ? 0 : (stage << 3 | counter);
SetHouseAnimationFrame(t, 0);
SetAnimationFrame(t, 0);
SetHouseProcessingTime(t, HouseSpec::Get(type)->processing_time);
}