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/station_map.h
View File

@@ -45,7 +45,7 @@ static const int GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET = 4; ///< The offset for the
static inline StationType GetStationType(TileIndex t)
{
assert(IsTileType(t, MP_STATION));
return (StationType)GB(_m[t].m6, 3, 3);
return (StationType)GB(_me[t].m6, 3, 3);
}
/**
@@ -394,7 +394,7 @@ static inline bool IsCompatibleTrainStationTile(TileIndex test_tile, TileIndex s
static inline bool HasStationReservation(TileIndex t)
{
assert(HasStationRail(t));
return HasBit(_m[t].m6, 2);
return HasBit(_me[t].m6, 2);
}
/**
@@ -406,7 +406,7 @@ static inline bool HasStationReservation(TileIndex t)
static inline void SetRailStationReservation(TileIndex t, bool b)
{
assert(HasStationRail(t));
SB(_m[t].m6, 2, 1, b ? 1 : 0);
SB(_me[t].m6, 2, 1, b ? 1 : 0);
}
/**
@@ -539,8 +539,8 @@ static inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType
_m[t].m3 = 0;
_m[t].m4 = 0;
_m[t].m5 = section;
SB(_m[t].m6, 2, 1, 0);
SB(_m[t].m6, 3, 3, st);
SB(_me[t].m6, 2, 1, 0);
SB(_me[t].m6, 3, 3, st);
_me[t].m7 = 0;
}