diff options
| author | rubidium <rubidium@openttd.org> | 2014-09-21 11:23:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-09-21 11:23:33 +0000 |
| commit | 982f5a6aa2f600106f9bd292ebefcef52e6e65e6 (patch) | |
| tree | 781d2ce0c99ac2261c600ef0a0b427a86ce3ffbc /src/industry_map.h | |
| parent | 18b98afabdc04874942b451b281ad28be967d1ae (diff) | |
| download | openttd-982f5a6aa2f600106f9bd292ebefcef52e6e65e6.tar.xz | |
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
Diffstat (limited to 'src/industry_map.h')
| -rw-r--r-- | src/industry_map.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/industry_map.h b/src/industry_map.h index 7d927a13c..9d2e3de21 100644 --- a/src/industry_map.h +++ b/src/industry_map.h @@ -127,7 +127,7 @@ static inline void SetIndustryConstructionStage(TileIndex tile, byte value) static inline IndustryGfx GetCleanIndustryGfx(TileIndex t) { assert(IsTileType(t, MP_INDUSTRY)); - return _m[t].m5 | (GB(_m[t].m6, 2, 1) << 8); + return _m[t].m5 | (GB(_me[t].m6, 2, 1) << 8); } /** @@ -152,7 +152,7 @@ static inline void SetIndustryGfx(TileIndex t, IndustryGfx gfx) { assert(IsTileType(t, MP_INDUSTRY)); _m[t].m5 = GB(gfx, 0, 8); - SB(_m[t].m6, 2, 1, GB(gfx, 8, 1)); + SB(_me[t].m6, 2, 1, GB(gfx, 8, 1)); } /** @@ -252,7 +252,7 @@ static inline void SetIndustryRandomBits(TileIndex tile, byte bits) static inline byte GetIndustryTriggers(TileIndex tile) { assert(IsTileType(tile, MP_INDUSTRY)); - return GB(_m[tile].m6, 3, 3); + return GB(_me[tile].m6, 3, 3); } @@ -266,7 +266,7 @@ static inline byte GetIndustryTriggers(TileIndex tile) static inline void SetIndustryTriggers(TileIndex tile, byte triggers) { assert(IsTileType(tile, MP_INDUSTRY)); - SB(_m[tile].m6, 3, 3, triggers); + SB(_me[tile].m6, 3, 3, triggers); } /** |