diff options
Diffstat (limited to 'src/base_station_base.h')
| -rw-r--r-- | src/base_station_base.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/base_station_base.h b/src/base_station_base.h index c94212087..7cfd8c2e9 100644 --- a/src/base_station_base.h +++ b/src/base_station_base.h @@ -139,7 +139,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> { * @param tile The tile to get the base station from. * @return the station associated with that tile. */ - static FORCEINLINE BaseStation *GetByTile(TileIndex tile) + static inline BaseStation *GetByTile(TileIndex tile) { return BaseStation::Get(GetStationIndex(tile)); } @@ -150,7 +150,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> { * facilities left. * @return true if still in use */ - FORCEINLINE bool IsInUse() const + inline bool IsInUse() const { return (this->facilities & ~FACIL_WAYPOINT) != 0; } @@ -172,7 +172,7 @@ struct SpecializedStation : public BaseStation { * Set station type correctly * @param tile The base tile of the station. */ - FORCEINLINE SpecializedStation<T, Tis_waypoint>(TileIndex tile) : + inline SpecializedStation<T, Tis_waypoint>(TileIndex tile) : BaseStation(tile) { this->facilities = EXPECTED_FACIL; @@ -183,7 +183,7 @@ struct SpecializedStation : public BaseStation { * @param st the station to check. * @return true if the station is the type we expect it to be. */ - static FORCEINLINE bool IsExpected(const BaseStation *st) + static inline bool IsExpected(const BaseStation *st) { return (st->facilities & FACIL_WAYPOINT) == EXPECTED_FACIL; } @@ -193,7 +193,7 @@ struct SpecializedStation : public BaseStation { * @param index tested index * @return is this index valid index of T? */ - static FORCEINLINE bool IsValidID(size_t index) + static inline bool IsValidID(size_t index) { return BaseStation::IsValidID(index) && IsExpected(BaseStation::Get(index)); } @@ -202,7 +202,7 @@ struct SpecializedStation : public BaseStation { * Gets station with given index * @return pointer to station with given index casted to T * */ - static FORCEINLINE T *Get(size_t index) + static inline T *Get(size_t index) { return (T *)BaseStation::Get(index); } @@ -211,7 +211,7 @@ struct SpecializedStation : public BaseStation { * Returns station if the index is a valid index for this station type * @return pointer to station with given index if it's a station of this type */ - static FORCEINLINE T *GetIfValid(size_t index) + static inline T *GetIfValid(size_t index) { return IsValidID(index) ? Get(index) : NULL; } @@ -221,7 +221,7 @@ struct SpecializedStation : public BaseStation { * @param tile The tile to get the station from. * @return the station associated with that tile. */ - static FORCEINLINE T *GetByTile(TileIndex tile) + static inline T *GetByTile(TileIndex tile) { return GetIfValid(GetStationIndex(tile)); } @@ -231,7 +231,7 @@ struct SpecializedStation : public BaseStation { * @param st BaseStation pointer * @return pointer to SpecializedStation */ - static FORCEINLINE T *From(BaseStation *st) + static inline T *From(BaseStation *st) { assert(IsExpected(st)); return (T *)st; @@ -242,7 +242,7 @@ struct SpecializedStation : public BaseStation { * @param st BaseStation pointer * @return pointer to SpecializedStation */ - static FORCEINLINE const T *From(const BaseStation *st) + static inline const T *From(const BaseStation *st) { assert(IsExpected(st)); return (const T *)st; |