dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.

Browse Source
This commit is contained in:
belugas
2006-04-12 18:10:54 +00:00
parent a588d816ff
commit 0a9d5f051f
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
industry_cmd.c
View File

@@ -608,9 +608,14 @@ static void AnimateTile_Industry(TileIndex tile)
SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile);
}
if (m >= 50 && (m=0,++_m[tile].m4 >= 8)) {
_m[tile].m4 = 0;
DeleteAnimatedTile(tile);
if (m >= 50) {
int n = GetIndustryAnimationLoop(tile) + 1;
m = 0;
if (n >= 8) {
n = 0;
DeleteAnimatedTile(tile);
}
SetIndustryAnimationLoop(tile, n);
}
_m[tile].m3 = m;
MarkTileDirtyByTile(tile);
@@ -732,7 +737,7 @@ static void MakeIndustryTileBigger(TileIndex tile)
case 162:
case 165:
_m[tile].m3 = 0;
_m[tile].m4 = 0;
SetIndustryAnimationLoop(tile, 0);
break;
case 148: case 149: case 150: case 151:
@@ -851,7 +856,7 @@ static void TileLoop_Industry(TileIndex tile)
Industry* i = GetIndustryByTile(tile);
if (i->was_cargo_delivered) {
i->was_cargo_delivered = false;
_m[tile].m4 = 0;
SetIndustryAnimationLoop(tile, 0);
AddAnimatedTile(tile);
}
}
@@ -1162,12 +1167,12 @@ void OnTick_Industry(void)
}
static bool CheckNewIndustry_NULL(TileIndex tile, int type)
static bool CheckNewIndustry_NULL(TileIndex tile, IndustryType type)
{
return true;
}
static bool CheckNewIndustry_Forest(TileIndex tile, int type)
static bool CheckNewIndustry_Forest(TileIndex tile, IndustryType type)
{
if (_opt.landscape == LT_HILLY) {
if (GetTileZ(tile) < _opt.snow_line + 16U) {
@@ -1181,7 +1186,7 @@ static bool CheckNewIndustry_Forest(TileIndex tile, int type)
extern bool _ignore_restrictions;
/* Oil Rig and Oil Refinery */
static bool CheckNewIndustry_Oil(TileIndex tile, int type)
static bool CheckNewIndustry_Oil(TileIndex tile, IndustryType type)
{
if (_game_mode == GM_EDITOR && _ignore_restrictions) return true;
if (_game_mode == GM_EDITOR && type != IT_OIL_RIG) return true;
@@ -1192,7 +1197,7 @@ static bool CheckNewIndustry_Oil(TileIndex tile, int type)
return false;
}
static bool CheckNewIndustry_Farm(TileIndex tile, int type)
static bool CheckNewIndustry_Farm(TileIndex tile, IndustryType type)
{
if (_opt.landscape == LT_HILLY) {
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line) {
@@ -1203,7 +1208,7 @@ static bool CheckNewIndustry_Farm(TileIndex tile, int type)
return true;
}
static bool CheckNewIndustry_Plantation(TileIndex tile, int type)
static bool CheckNewIndustry_Plantation(TileIndex tile, IndustryType type)
{
if (GetTropicZone(tile) == TROPICZONE_DESERT) {
_error_message = STR_0239_SITE_UNSUITABLE;
@@ -1213,7 +1218,7 @@ static bool CheckNewIndustry_Plantation(TileIndex tile, int type)
return true;
}
static bool CheckNewIndustry_Water(TileIndex tile, int type)
static bool CheckNewIndustry_Water(TileIndex tile, IndustryType type)
{
if (GetTropicZone(tile) != TROPICZONE_DESERT) {
_error_message = STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT;
@@ -1223,7 +1228,7 @@ static bool CheckNewIndustry_Water(TileIndex tile, int type)
return true;
}
static bool CheckNewIndustry_Lumbermill(TileIndex tile, int type)
static bool CheckNewIndustry_Lumbermill(TileIndex tile, IndustryType type)
{
if (GetTropicZone(tile) != TROPICZONE_RAINFOREST) {
_error_message = STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST;
@@ -1232,12 +1237,12 @@ static bool CheckNewIndustry_Lumbermill(TileIndex tile, int type)
return true;
}
static bool CheckNewIndustry_BubbleGen(TileIndex tile, int type)
static bool CheckNewIndustry_BubbleGen(TileIndex tile, IndustryType type)
{
return GetTileZ(tile) <= 32;
}
typedef bool CheckNewIndustryProc(TileIndex tile, int type);
typedef bool CheckNewIndustryProc(TileIndex tile, IndustryType type);
static CheckNewIndustryProc * const _check_new_industry_procs[] = {
CheckNewIndustry_NULL,
CheckNewIndustry_Forest,
@@ -1591,7 +1596,7 @@ int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
}
Industry *CreateNewIndustry(TileIndex tile, int type)
Industry *CreateNewIndustry(TileIndex tile, IndustryType type)
{
const Town* t;
const IndustryTileTable *it;

25
industry_map.h
View File

@@ -78,7 +78,7 @@ static inline void SetIndustryGfx(TileIndex t, IndustryGfx gfx)
_m[t].m5 = gfx;
}
static inline void MakeIndustry(TileIndex t, uint index, uint gfx)
static inline void MakeIndustry(TileIndex t, uint index, IndustryGfx gfx)
{
SetTileType(t, MP_INDUSTRY);
_m[t].m1 = 0;
@@ -170,4 +170,27 @@ static const IndustryTypeSolver industry_gfx_Solver [IT_END] = {
{167, 174} //IT_SUGAR_MINE,
};
/**
* Get the animation loop number
* @param tile the tile to get the animation loop number of
* @pre IsTileType(tile, MP_INDUSTRY
*/
static inline byte GetIndustryAnimationLoop(TileIndex tile)
{
assert(IsTileType(tile, MP_INDUSTRY));
return _m[tile].m4;
}
/**
* Set the animation loop number
* @param tile the tile to set the animation loop number of
* @param count the new animation frame number
* @pre IsTileType(tile, MP_INDUSTRY
*/
static inline void SetIndustryAnimationLoop(TileIndex tile, byte count)
{
assert(IsTileType(tile, MP_INDUSTRY));
_m[tile].m4 = count;
}
#endif /* INDUSTRY_MAP_H */