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

(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.

Browse Source
This commit is contained in:
rubidium
2006-12-30 11:57:52 +00:00
parent c7b1fd6fc2
commit 5f88e81641
7 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
industry_map.h
View File

@@ -241,24 +241,7 @@ static inline void SetIndustryAnimationLoop(TileIndex tile, byte count)
static inline byte GetIndustryAnimationState(TileIndex tile)
{
assert(IsTileType(tile, MP_INDUSTRY));
switch (GetIndustryGfx(tile)) {
case GFX_POWERPLANT_SPARKS:
return GB(_m[tile].m1, 2, 5);
break;
case GFX_OILWELL_ANIMATED_1:
case GFX_OILWELL_ANIMATED_2:
case GFX_OILWELL_ANIMATED_3:
return GB(_m[tile].m1, 0, 2);
case GFX_COAL_MINE_TOWER_ANIMATED:
case GFX_COPPER_MINE_TOWER_ANIMATED:
case GFX_GOLD_MINE_TOWER_ANIMATED:
return _m[tile].m1;
default:
return _m[tile].m3;
}
return _m[tile].m3;
}
/**
@@ -270,27 +253,7 @@ static inline byte GetIndustryAnimationState(TileIndex tile)
static inline void SetIndustryAnimationState(TileIndex tile, byte state)
{
assert(IsTileType(tile, MP_INDUSTRY));
switch (GetIndustryGfx(tile)) {
case GFX_POWERPLANT_SPARKS:
SB(_m[tile].m1, 2, 5, state);
break;
case GFX_OILWELL_ANIMATED_1:
case GFX_OILWELL_ANIMATED_2:
case GFX_OILWELL_ANIMATED_3:
SB(_m[tile].m1, 0, 2, state);
break;
case GFX_COAL_MINE_TOWER_ANIMATED:
case GFX_COPPER_MINE_TOWER_ANIMATED:
case GFX_GOLD_MINE_TOWER_ANIMATED:
_m[tile].m1 = state;
break;
default:
_m[tile].m3 = state;
break;
}
_m[tile].m3 = state;
}
#endif /* INDUSTRY_MAP_H */