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

(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable

Browse Source
This commit is contained in:
rubidium
2014-09-21 11:23:33 +00:00
parent 8a993b6141
commit f3b79480ed
17 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/town_map.h
View File

@@ -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;
}
/**