summaryrefslogtreecommitdiff
path: root/src/town_map.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-09-21 11:23:33 +0000
committerrubidium <rubidium@openttd.org>2014-09-21 11:23:33 +0000
commit982f5a6aa2f600106f9bd292ebefcef52e6e65e6 (patch)
tree781d2ce0c99ac2261c600ef0a0b427a86ce3ffbc /src/town_map.h
parent18b98afabdc04874942b451b281ad28be967d1ae (diff)
downloadopenttd-982f5a6aa2f600106f9bd292ebefcef52e6e65e6.tar.xz
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
Diffstat (limited to 'src/town_map.h')
-rw-r--r--src/town_map.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/town_map.h b/src/town_map.h
index 41505871d..016ff9a6d 100644
--- a/src/town_map.h
+++ b/src/town_map.h
@@ -126,7 +126,7 @@ static inline void HaltLift(TileIndex t)
*/
static inline byte GetLiftPosition(TileIndex t)
{
- return GB(_m[t].m6, 2, 6);
+ return GB(_me[t].m6, 2, 6);
}
/**
@@ -136,7 +136,7 @@ static inline byte GetLiftPosition(TileIndex t)
*/
static inline void SetLiftPosition(TileIndex t, byte pos)
{
- SB(_m[t].m6, 2, 6, pos);
+ SB(_me[t].m6, 2, 6, pos);
}
/**
@@ -315,7 +315,7 @@ static inline byte GetHouseTriggers(TileIndex t)
static inline byte GetHouseProcessingTime(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
- return GB(_m[t].m6, 2, 6);
+ return GB(_me[t].m6, 2, 6);
}
/**
@@ -327,7 +327,7 @@ static inline byte GetHouseProcessingTime(TileIndex t)
static inline void SetHouseProcessingTime(TileIndex t, byte time)
{
assert(IsTileType(t, MP_HOUSE));
- SB(_m[t].m6, 2, 6, time);
+ SB(_me[t].m6, 2, 6, time);
}
/**
@@ -338,7 +338,7 @@ static inline void SetHouseProcessingTime(TileIndex t, byte time)
static inline void DecHouseProcessingTime(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
- _m[t].m6 -= 1 << 2;
+ _me[t].m6 -= 1 << 2;
}
/**