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/station_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/station_map.h')
| -rw-r--r-- | src/station_map.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/station_map.h b/src/station_map.h index 67f41f1d7..7ca9bd720 100644 --- a/src/station_map.h +++ b/src/station_map.h @@ -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; } |