Merge branch 'master' into jgrpp

# Conflicts: # src/3rdparty/squirrel/include/squirrel.h # src/blitter/32bpp_sse_func.hpp # src/bridge_map.h # src/clear_map.h # src/company_manager_face.h # src/console_func.h # src/core/bitmath_func.hpp # src/core/endian_func.hpp # src/core/random_func.hpp # src/depot_map.h # src/elrail_func.h # src/fontcache.h # src/industry_map.h # src/map_func.h # src/newgrf_spritegroup.h # src/object_map.h # src/rail.h # src/rail_map.h # src/road_func.h # src/road_map.h # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/settings_gui.cpp # src/sl/oldloader.h # src/sprite.h # src/spritecache.h # src/station_func.h # src/station_map.h # src/story_base.h # src/strings_func.h # src/tile_cmd.h # src/tile_map.h # src/tile_type.h # src/town.h # src/town_map.h # src/tree_map.h # src/tunnel_map.h # src/tunnelbridge_map.h # src/vehicle_func.h # src/viewport_func.h # src/void_map.h # src/water.h # src/water_map.h # src/widget_type.h
2024-01-07 15:00:16 +00:00
parent 8271813a47 1e56bd1e5a
commit 55d78a23be
106 changed files with 1080 additions and 1080 deletions
--- a/src/station_map.h
+++ b/src/station_map.h
@@ -25,7 +25,7 @@ typedef byte StationGfx; ///< Index of station graphics. @see _station_display_d
 * @pre IsTileType(t, MP_STATION)
 * @return Station ID of the station at \a t
 */
-static inline StationID GetStationIndex(TileIndex t)
+inline StationID GetStationIndex(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return (StationID)_m[t].m2;
@@ -41,7 +41,7 @@ static const int GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET =  4; ///< The offset for the
 * @pre IsTileType(t, MP_STATION)
 * @return the station type
 */
-static inline StationType GetStationType(TileIndex t)
+inline StationType GetStationType(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return (StationType)GB(_me[t].m6, 3, 4);
@@ -53,7 +53,7 @@ static inline StationType GetStationType(TileIndex t)
 * @pre GetStationType(t) == STATION_TRUCK || GetStationType(t) == STATION_BUS
 * @return the road stop type
 */
-static inline RoadStopType GetRoadStopType(TileIndex t)
+inline RoadStopType GetRoadStopType(TileIndex t)
 {
 	dbg_assert_tile(GetStationType(t) == STATION_TRUCK || GetStationType(t) == STATION_BUS, t);
 	return GetStationType(t) == STATION_TRUCK ? ROADSTOP_TRUCK : ROADSTOP_BUS;
@@ -65,7 +65,7 @@ static inline RoadStopType GetRoadStopType(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return the station graphics
 */
-static inline StationGfx GetStationGfx(TileIndex t)
+inline StationGfx GetStationGfx(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return _m[t].m5;
@@ -77,7 +77,7 @@ static inline StationGfx GetStationGfx(TileIndex t)
 * @param gfx the new graphics
 * @pre IsTileType(t, MP_STATION)
 */
-static inline void SetStationGfx(TileIndex t, StationGfx gfx)
+inline void SetStationGfx(TileIndex t, StationGfx gfx)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	_m[t].m5 = gfx;
@@ -89,7 +89,7 @@ static inline void SetStationGfx(TileIndex t, StationGfx gfx)
 * @pre IsTileType(t, MP_STATION)
 * @return true if and only if the tile is a rail station
 */
-static inline bool IsRailStation(TileIndex t)
+inline bool IsRailStation(TileIndex t)
 {
 	return GetStationType(t) == STATION_RAIL;
 }
@@ -99,7 +99,7 @@ static inline bool IsRailStation(TileIndex t)
 * @param t the tile to get the information from
 * @return true if and only if the tile is a rail station
 */
-static inline bool IsRailStationTile(TileIndex t)
+inline bool IsRailStationTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsRailStation(t);
 }
@@ -110,7 +110,7 @@ static inline bool IsRailStationTile(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return true if and only if the tile is a rail waypoint
 */
-static inline bool IsRailWaypoint(TileIndex t)
+inline bool IsRailWaypoint(TileIndex t)
 {
 	return GetStationType(t) == STATION_WAYPOINT;
 }
@@ -120,7 +120,7 @@ static inline bool IsRailWaypoint(TileIndex t)
 * @param t the tile to get the information from
 * @return true if and only if the tile is a rail waypoint
 */
-static inline bool IsRailWaypointTile(TileIndex t)
+inline bool IsRailWaypointTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsRailWaypoint(t);
 }
@@ -132,7 +132,7 @@ static inline bool IsRailWaypointTile(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return true if and only if the tile has rail
 */
-static inline bool HasStationRail(TileIndex t)
+inline bool HasStationRail(TileIndex t)
 {
 	return IsRailStation(t) || IsRailWaypoint(t);
 }
@@ -143,7 +143,7 @@ static inline bool HasStationRail(TileIndex t)
 * @param t the tile to check
 * @return true if and only if the tile is a station tile and has rail
 */
-static inline bool HasStationTileRail(TileIndex t)
+inline bool HasStationTileRail(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && HasStationRail(t);
 }
@@ -154,7 +154,7 @@ static inline bool HasStationTileRail(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return true if and only if the tile is an airport
 */
-static inline bool IsAirport(TileIndex t)
+inline bool IsAirport(TileIndex t)
 {
 	return GetStationType(t) == STATION_AIRPORT;
 }
@@ -164,7 +164,7 @@ static inline bool IsAirport(TileIndex t)
 * @param t the tile to get the information from
 * @return true if and only if the tile is an airport
 */
-static inline bool IsAirportTile(TileIndex t)
+inline bool IsAirportTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsAirport(t);
 }
@@ -177,7 +177,7 @@ bool IsHangar(TileIndex t);
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if station is a truck stop, \c false otherwise
 */
-static inline bool IsTruckStop(TileIndex t)
+inline bool IsTruckStop(TileIndex t)
 {
 	return GetStationType(t) == STATION_TRUCK;
 }
@@ -188,7 +188,7 @@ static inline bool IsTruckStop(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if station is a bus stop, \c false otherwise
 */
-static inline bool IsBusStop(TileIndex t)
+inline bool IsBusStop(TileIndex t)
 {
 	return GetStationType(t) == STATION_BUS;
 }
@@ -199,7 +199,7 @@ static inline bool IsBusStop(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if station is a road waypoint, \c false otherwise
 */
-static inline bool IsRoadWaypoint(TileIndex t)
+inline bool IsRoadWaypoint(TileIndex t)
 {
 	return GetStationType(t) == STATION_ROADWAYPOINT;
 }
@@ -209,7 +209,7 @@ static inline bool IsRoadWaypoint(TileIndex t)
 * @param t the tile to get the information from
 * @return true if and only if the tile is a road waypoint
 */
-static inline bool IsRoadWaypointTile(TileIndex t)
+inline bool IsRoadWaypointTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsRoadWaypoint(t);
 }
@@ -220,7 +220,7 @@ static inline bool IsRoadWaypointTile(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if station at the tile is a bus stop, truck stop \c false otherwise
 */
-static inline bool IsStationRoadStop(TileIndex t)
+inline bool IsStationRoadStop(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return IsTruckStop(t) || IsBusStop(t);
@@ -231,7 +231,7 @@ static inline bool IsStationRoadStop(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a station tile and a road stop
 */
-static inline bool IsStationRoadStopTile(TileIndex t)
+inline bool IsStationRoadStopTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsStationRoadStop(t);
 }
@@ -242,7 +242,7 @@ static inline bool IsStationRoadStopTile(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if station at the tile is a bus stop, truck stop or road waypoint, \c false otherwise
 */
-static inline bool IsAnyRoadStop(TileIndex t)
+inline bool IsAnyRoadStop(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return IsTruckStop(t) || IsBusStop(t) || IsRoadWaypoint(t);
@@ -253,7 +253,7 @@ static inline bool IsAnyRoadStop(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a station tile and a road stop
 */
-static inline bool IsAnyRoadStopTile(TileIndex t)
+inline bool IsAnyRoadStopTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsAnyRoadStop(t);
 }
@@ -263,7 +263,7 @@ static inline bool IsAnyRoadStopTile(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a station tile and a bay road stop
 */
-static inline bool IsBayRoadStopTile(TileIndex t)
+inline bool IsBayRoadStopTile(TileIndex t)
 {
 	return IsAnyRoadStopTile(t) && GetStationGfx(t) < GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET;
 }
@@ -273,7 +273,7 @@ static inline bool IsBayRoadStopTile(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a station tile and a drive through road stop
 */
-static inline bool IsDriveThroughStopTile(TileIndex t)
+inline bool IsDriveThroughStopTile(TileIndex t)
 {
 	return IsAnyRoadStopTile(t) && GetStationGfx(t) >= GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET;
 }
@@ -283,7 +283,7 @@ static inline bool IsDriveThroughStopTile(TileIndex t)
 * @param t the tile to get the directions from
 * @return the disallowed directions
 */
-static inline DisallowedRoadDirections GetDriveThroughStopDisallowedRoadDirections(TileIndex t)
+inline DisallowedRoadDirections GetDriveThroughStopDisallowedRoadDirections(TileIndex t)
 {
 	dbg_assert_tile(IsDriveThroughStopTile(t), t);
 	return (DisallowedRoadDirections)GB(_m[t].m3, 0, 2);
@@ -294,7 +294,7 @@ static inline DisallowedRoadDirections GetDriveThroughStopDisallowedRoadDirectio
 * @param t   the tile to set the directions for
 * @param drd the disallowed directions
 */
-static inline void SetDriveThroughStopDisallowedRoadDirections(TileIndex t, DisallowedRoadDirections drd)
+inline void SetDriveThroughStopDisallowedRoadDirections(TileIndex t, DisallowedRoadDirections drd)
 {
 	dbg_assert_tile(IsDriveThroughStopTile(t), t);
 	dbg_assert(drd < DRD_END);
@@ -306,7 +306,7 @@ static inline void SetDriveThroughStopDisallowedRoadDirections(TileIndex t, Disa
 * @param tile The tile to query.
 * @return The road decoration of the tile.
 */
-static inline Roadside GetRoadWaypointRoadside(TileIndex tile)
+inline Roadside GetRoadWaypointRoadside(TileIndex tile)
 {
 	dbg_assert_tile(IsRoadWaypointTile(tile), tile);
 	return (Roadside)GB(_m[tile].m3, 2, 2);
@@ -317,7 +317,7 @@ static inline Roadside GetRoadWaypointRoadside(TileIndex tile)
 * @param tile The tile to change.
 * @param s    The new road decoration of the tile.
 */
-static inline void SetRoadWaypointRoadside(TileIndex tile, Roadside s)
+inline void SetRoadWaypointRoadside(TileIndex tile, Roadside s)
 {
 	dbg_assert_tile(IsRoadWaypointTile(tile), tile);
 	SB(_m[tile].m3, 2, 2, s);
@@ -328,7 +328,7 @@ static inline void SetRoadWaypointRoadside(TileIndex tile, Roadside s)
 * @param t The tile to query.
 * @return True if the tile has snow/desert.
 */
-static inline bool IsRoadWaypointOnSnowOrDesert(TileIndex t)
+inline bool IsRoadWaypointOnSnowOrDesert(TileIndex t)
 {
 	dbg_assert_tile(IsRoadWaypointTile(t), t);
 	return HasBit(_me[t].m8, 15);
@@ -338,7 +338,7 @@ static inline bool IsRoadWaypointOnSnowOrDesert(TileIndex t)
 * Toggle the snow/desert state of a road waypoint tile.
 * @param t The tile to change.
 */
-static inline void ToggleRoadWaypointOnSnowOrDesert(TileIndex t)
+inline void ToggleRoadWaypointOnSnowOrDesert(TileIndex t)
 {
 	dbg_assert_tile(IsRoadWaypointTile(t), t);
 	ToggleBit(_me[t].m8, 15);
@@ -352,7 +352,7 @@ StationGfx GetTranslatedAirportTileID(StationGfx gfx);
 * @pre IsAirport(t)
 * @return the station graphics
 */
-static inline StationGfx GetAirportGfx(TileIndex t)
+inline StationGfx GetAirportGfx(TileIndex t)
 {
 	dbg_assert_tile(IsAirport(t), t);
 	return GetTranslatedAirportTileID(GetStationGfx(t));
@@ -364,7 +364,7 @@ static inline StationGfx GetAirportGfx(TileIndex t)
 * @pre IsAnyRoadStopTile(t)
 * @return the direction of the entrance
 */
-static inline DiagDirection GetRoadStopDir(TileIndex t)
+inline DiagDirection GetRoadStopDir(TileIndex t)
 {
 	StationGfx gfx = GetStationGfx(t);
 	dbg_assert_tile(IsAnyRoadStopTile(t), t);
@@ -381,7 +381,7 @@ static inline DiagDirection GetRoadStopDir(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if the tile is an oilrig tile
 */
-static inline bool IsOilRig(TileIndex t)
+inline bool IsOilRig(TileIndex t)
 {
 	return GetStationType(t) == STATION_OILRIG;
 }
@@ -392,7 +392,7 @@ static inline bool IsOilRig(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if the tile is a dock
 */
-static inline bool IsDock(TileIndex t)
+inline bool IsDock(TileIndex t)
 {
 	return GetStationType(t) == STATION_DOCK;
 }
@@ -402,7 +402,7 @@ static inline bool IsDock(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a dock
 */
-static inline bool IsDockTile(TileIndex t)
+inline bool IsDockTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && GetStationType(t) == STATION_DOCK;
 }
@@ -413,7 +413,7 @@ static inline bool IsDockTile(TileIndex t)
 * @pre IsTileType(t, MP_STATION)
 * @return \c true if the tile is a buoy
 */
-static inline bool IsBuoy(TileIndex t)
+inline bool IsBuoy(TileIndex t)
 {
 	return GetStationType(t) == STATION_BUOY;
 }
@@ -423,7 +423,7 @@ static inline bool IsBuoy(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is a buoy
 */
-static inline bool IsBuoyTile(TileIndex t)
+inline bool IsBuoyTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsBuoy(t);
 }
@@ -433,7 +433,7 @@ static inline bool IsBuoyTile(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is an hangar
 */
-static inline bool IsHangarTile(TileIndex t)
+inline bool IsHangarTile(TileIndex t)
 {
 	return IsTileType(t, MP_STATION) && IsHangar(t);
 }
@@ -444,7 +444,7 @@ static inline bool IsHangarTile(TileIndex t)
 * @param t Tile to check
 * @return \c true if the tile is blocked
 */
-static inline bool IsStationTileBlocked(TileIndex t)
+inline bool IsStationTileBlocked(TileIndex t)
 {
 	assert(HasStationRail(t));
 	return HasBit(_me[t].m6, 0);
@@ -456,7 +456,7 @@ static inline bool IsStationTileBlocked(TileIndex t)
 * @param t the station tile
 * @param b the blocked state
 */
-static inline void SetStationTileBlocked(TileIndex t, bool b)
+inline void SetStationTileBlocked(TileIndex t, bool b)
 {
 	assert(HasStationRail(t));
 	SB(_me[t].m6, 0, 1, b ? 1 : 0);
@@ -468,7 +468,7 @@ static inline void SetStationTileBlocked(TileIndex t, bool b)
 * @param t Tile to check
 * @return \c true if the tile can have catenary wires
 */
-static inline bool CanStationTileHaveWires(TileIndex t)
+inline bool CanStationTileHaveWires(TileIndex t)
 {
 	assert(HasStationRail(t));
 	return HasBit(_me[t].m6, 1);
@@ -480,7 +480,7 @@ static inline bool CanStationTileHaveWires(TileIndex t)
 * @param t the station tile
 * @param b the catenary wires state
 */
-static inline void SetStationTileHaveWires(TileIndex t, bool b)
+inline void SetStationTileHaveWires(TileIndex t, bool b)
 {
 	assert(HasStationRail(t));
 	SB(_me[t].m6, 1, 1, b ? 1 : 0);
@@ -492,7 +492,7 @@ static inline void SetStationTileHaveWires(TileIndex t, bool b)
 * @param t Tile to check
 * @return \c true if the tile can have catenary pylons
 */
-static inline bool CanStationTileHavePylons(TileIndex t)
+inline bool CanStationTileHavePylons(TileIndex t)
 {
 	assert(HasStationRail(t));
 	return HasBit(_me[t].m6, 7);
@@ -504,7 +504,7 @@ static inline bool CanStationTileHavePylons(TileIndex t)
 * @param t the station tile
 * @param b the catenary pylons state
 */
-static inline void SetStationTileHavePylons(TileIndex t, bool b)
+inline void SetStationTileHavePylons(TileIndex t, bool b)
 {
 	assert(HasStationRail(t));
 	SB(_me[t].m6, 7, 1, b ? 1 : 0);
@@ -516,7 +516,7 @@ static inline void SetStationTileHavePylons(TileIndex t, bool b)
 * @pre HasStationRail(t)
 * @return The direction of the rails on tile \a t.
 */
-static inline Axis GetRailStationAxis(TileIndex t)
+inline Axis GetRailStationAxis(TileIndex t)
 {
 	dbg_assert_tile(HasStationRail(t), t);
 	return HasBit(GetStationGfx(t), 0) ? AXIS_Y : AXIS_X;
@@ -528,7 +528,7 @@ static inline Axis GetRailStationAxis(TileIndex t)
 * @pre HasStationRail(t)
 * @return The rail track of the rails on tile \a t.
 */
-static inline Track GetRailStationTrack(TileIndex t)
+inline Track GetRailStationTrack(TileIndex t)
 {
 	return AxisToTrack(GetRailStationAxis(t));
 }
@@ -539,7 +539,7 @@ static inline Track GetRailStationTrack(TileIndex t)
 * @pre HasStationRail(t)
 * @return The trackbits of the rails on tile \a t.
 */
-static inline TrackBits GetRailStationTrackBits(TileIndex t)
+inline TrackBits GetRailStationTrackBits(TileIndex t)
 {
 	return AxisToTrackBits(GetRailStationAxis(t));
 }
@@ -557,7 +557,7 @@ static inline TrackBits GetRailStationTrackBits(TileIndex t)
 * @pre IsRailStationTile(station_tile)
 * @return true if the two tiles are compatible
 */
-static inline bool IsCompatibleTrainStationTile(TileIndex test_tile, TileIndex station_tile)
+inline bool IsCompatibleTrainStationTile(TileIndex test_tile, TileIndex station_tile)
 {
 	dbg_assert_tile(IsRailStationTile(station_tile), station_tile);
 	return IsRailStationTile(test_tile) && !IsStationTileBlocked(test_tile) &&
@@ -572,7 +572,7 @@ static inline bool IsCompatibleTrainStationTile(TileIndex test_tile, TileIndex s
 * @param t the station tile
 * @return reservation state
 */
-static inline bool HasStationReservation(TileIndex t)
+inline bool HasStationReservation(TileIndex t)
 {
 	dbg_assert_tile(HasStationRail(t), t);
 	return HasBit(_me[t].m6, 2);
@@ -584,7 +584,7 @@ static inline bool HasStationReservation(TileIndex t)
 * @param t the station tile
 * @param b the reservation state
 */
-static inline void SetRailStationReservation(TileIndex t, bool b)
+inline void SetRailStationReservation(TileIndex t, bool b)
 {
 	dbg_assert_tile(HasStationRail(t), t);
 	SB(_me[t].m6, 2, 1, b ? 1 : 0);
@@ -596,7 +596,7 @@ static inline void SetRailStationReservation(TileIndex t, bool b)
 * @param t the tile
 * @return reserved track bits
 */
-static inline TrackBits GetStationReservationTrackBits(TileIndex t)
+inline TrackBits GetStationReservationTrackBits(TileIndex t)
 {
 	return HasStationReservation(t) ? GetRailStationTrackBits(t) : TRACK_BIT_NONE;
 }
@@ -608,7 +608,7 @@ static inline TrackBits GetStationReservationTrackBits(TileIndex t)
 * @pre \a t is the land part of the dock
 * @return The direction of the dock on tile \a t.
 */
-static inline DiagDirection GetDockDirection(TileIndex t)
+inline DiagDirection GetDockDirection(TileIndex t)
 {
 	StationGfx gfx = GetStationGfx(t);
 	dbg_assert_tile(IsDock(t) && gfx < GFX_DOCK_BASE_WATER_PART, t);
@@ -618,7 +618,7 @@ static inline DiagDirection GetDockDirection(TileIndex t)
 /**
 * Check whether a dock tile is the tile on water.
 */
-static inline bool IsDockWaterPart(TileIndex t)
+inline bool IsDockWaterPart(TileIndex t)
 {
 	assert(IsDockTile(t));
 	StationGfx gfx = GetStationGfx(t);
@@ -631,7 +631,7 @@ static inline bool IsDockWaterPart(TileIndex t)
 * @pre HasStationTileRail(t)
 * @return True if this station is part of a newgrf station.
 */
-static inline bool IsCustomStationSpecIndex(TileIndex t)
+inline bool IsCustomStationSpecIndex(TileIndex t)
 {
 	dbg_assert_tile(HasStationTileRail(t), t);
 	return _m[t].m4 != 0;
@@ -643,7 +643,7 @@ static inline bool IsCustomStationSpecIndex(TileIndex t)
 * @param specindex The new spec.
 * @pre HasStationTileRail(t)
 */
-static inline void SetCustomStationSpecIndex(TileIndex t, byte specindex)
+inline void SetCustomStationSpecIndex(TileIndex t, byte specindex)
 {
 	dbg_assert_tile(HasStationTileRail(t), t);
 	_m[t].m4 = specindex;
@@ -655,7 +655,7 @@ static inline void SetCustomStationSpecIndex(TileIndex t, byte specindex)
 * @pre HasStationTileRail(t)
 * @return The custom station spec of this tile.
 */
-static inline uint GetCustomStationSpecIndex(TileIndex t)
+inline uint GetCustomStationSpecIndex(TileIndex t)
 {
 	dbg_assert_tile(HasStationTileRail(t), t);
 	return _m[t].m4;
@@ -667,7 +667,7 @@ static inline uint GetCustomStationSpecIndex(TileIndex t)
 * @pre IsAnyRoadStopTile(t)
 * @return True if this station is part of a newgrf station.
 */
-static inline bool IsCustomRoadStopSpecIndex(TileIndex t)
+inline bool IsCustomRoadStopSpecIndex(TileIndex t)
 {
 	dbg_assert_tile(IsAnyRoadStopTile(t), t);
 	return GB(_me[t].m8, 0, 6) != 0;
@@ -679,7 +679,7 @@ static inline bool IsCustomRoadStopSpecIndex(TileIndex t)
 * @param specindex The new spec.
 * @pre IsAnyRoadStopTile(t)
 */
-static inline void SetCustomRoadStopSpecIndex(TileIndex t, byte specindex)
+inline void SetCustomRoadStopSpecIndex(TileIndex t, byte specindex)
 {
 	dbg_assert_tile(IsAnyRoadStopTile(t), t);
 	SB(_me[t].m8, 0, 6, specindex);
@@ -691,7 +691,7 @@ static inline void SetCustomRoadStopSpecIndex(TileIndex t, byte specindex)
 * @pre IsAnyRoadStopTile(t)
 * @return The custom station spec of this tile.
 */
-static inline uint GetCustomRoadStopSpecIndex(TileIndex t)
+inline uint GetCustomRoadStopSpecIndex(TileIndex t)
 {
 	dbg_assert_tile(IsAnyRoadStopTile(t), t);
 	return GB(_me[t].m8, 0, 6);
@@ -703,7 +703,7 @@ static inline uint GetCustomRoadStopSpecIndex(TileIndex t)
 * @param random_bits The random bits.
 * @pre IsTileType(t, MP_STATION)
 */
-static inline void SetStationTileRandomBits(TileIndex t, byte random_bits)
+inline void SetStationTileRandomBits(TileIndex t, byte random_bits)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	SB(_m[t].m3, 4, 4, random_bits);
@@ -715,7 +715,7 @@ static inline void SetStationTileRandomBits(TileIndex t, byte random_bits)
 * @pre IsTileType(t, MP_STATION)
 * @return The random bits for this station tile.
 */
-static inline byte GetStationTileRandomBits(TileIndex t)
+inline byte GetStationTileRandomBits(TileIndex t)
 {
 	dbg_assert_tile(IsTileType(t, MP_STATION), t);
 	return GB(_m[t].m3, 4, 4);
@@ -730,7 +730,7 @@ static inline byte GetStationTileRandomBits(TileIndex t)
 * @param section the StationGfx to be used for this tile
 * @param wc The water class of the station
 */
-static inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType st, byte section, WaterClass wc = WATER_CLASS_INVALID)
+inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType st, byte section, WaterClass wc = WATER_CLASS_INVALID)
 {
 	SetTileType(t, MP_STATION);
 	SetTileOwner(t, o);
@@ -755,7 +755,7 @@ static inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType
 * @param section the StationGfx to be used for this tile
 * @param rt the railtype of this tile
 */
-static inline void MakeRailStation(TileIndex t, Owner o, StationID sid, Axis a, byte section, RailType rt)
+inline void MakeRailStation(TileIndex t, Owner o, StationID sid, Axis a, byte section, RailType rt)
 {
 	MakeStation(t, o, sid, STATION_RAIL, section + a);
 	SetRailType(t, rt);
@@ -771,7 +771,7 @@ static inline void MakeRailStation(TileIndex t, Owner o, StationID sid, Axis a,
 * @param section the StationGfx to be used for this tile
 * @param rt the railtype of this tile
 */
-static inline void MakeRailWaypoint(TileIndex t, Owner o, StationID sid, Axis a, byte section, RailType rt)
+inline void MakeRailWaypoint(TileIndex t, Owner o, StationID sid, Axis a, byte section, RailType rt)
 {
 	MakeStation(t, o, sid, STATION_WAYPOINT, section + a);
 	SetRailType(t, rt);
@@ -788,7 +788,7 @@ static inline void MakeRailWaypoint(TileIndex t, Owner o, StationID sid, Axis a,
 * @param tram_rt the tram roadtype on this tile
 * @param d the direction of the roadstop
 */
-static inline void MakeRoadStop(TileIndex t, Owner o, StationID sid, RoadStopType rst, RoadType road_rt, RoadType tram_rt, DiagDirection d)
+inline void MakeRoadStop(TileIndex t, Owner o, StationID sid, RoadStopType rst, RoadType road_rt, RoadType tram_rt, DiagDirection d)
 {
 	MakeStation(t, o, sid, (rst == ROADSTOP_BUS ? STATION_BUS : STATION_TRUCK), d);
 	SetRoadTypes(t, road_rt, tram_rt);
@@ -808,7 +808,7 @@ static inline void MakeRoadStop(TileIndex t, Owner o, StationID sid, RoadStopTyp
 * @param tram_rt the tram roadtype on this tile
 * @param a the direction of the roadstop
 */
-static inline void MakeDriveThroughRoadStop(TileIndex t, Owner station, Owner road, Owner tram, StationID sid, StationType rst, RoadType road_rt, RoadType tram_rt, Axis a)
+inline void MakeDriveThroughRoadStop(TileIndex t, Owner station, Owner road, Owner tram, StationID sid, StationType rst, RoadType road_rt, RoadType tram_rt, Axis a)
 {
 	MakeStation(t, station, sid, rst, GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET + a);
 	SetRoadTypes(t, road_rt, tram_rt);
@@ -824,7 +824,7 @@ static inline void MakeDriveThroughRoadStop(TileIndex t, Owner station, Owner ro
 * @param section the StationGfx to be used for this tile
 * @param wc the type of water on this tile
 */
-static inline void MakeAirport(TileIndex t, Owner o, StationID sid, byte section, WaterClass wc)
+inline void MakeAirport(TileIndex t, Owner o, StationID sid, byte section, WaterClass wc)
 {
 	MakeStation(t, o, sid, STATION_AIRPORT, section, wc);
 }
@@ -835,7 +835,7 @@ static inline void MakeAirport(TileIndex t, Owner o, StationID sid, byte section
 * @param sid the station to which this tile belongs
 * @param wc the type of water on this tile
 */
-static inline void MakeBuoy(TileIndex t, StationID sid, WaterClass wc)
+inline void MakeBuoy(TileIndex t, StationID sid, WaterClass wc)
 {
 	/* Make the owner of the buoy tile the same as the current owner of the
 	 * water tile. In this way, we can reset the owner of the water to its
@@ -851,7 +851,7 @@ static inline void MakeBuoy(TileIndex t, StationID sid, WaterClass wc)
 * @param d the direction of the dock
 * @param wc the type of water on this tile
 */
-static inline void MakeDock(TileIndex t, Owner o, StationID sid, DiagDirection d, WaterClass wc)
+inline void MakeDock(TileIndex t, Owner o, StationID sid, DiagDirection d, WaterClass wc)
 {
 	MakeStation(t, o, sid, STATION_DOCK, d);
 	MakeStation(t + TileOffsByDiagDir(d), o, sid, STATION_DOCK, GFX_DOCK_BASE_WATER_PART + DiagDirToAxis(d), wc);
@@ -863,7 +863,7 @@ static inline void MakeDock(TileIndex t, Owner o, StationID sid, DiagDirection d
 * @param sid the station to which this tile belongs
 * @param wc the type of water on this tile
 */
-static inline void MakeOilrig(TileIndex t, StationID sid, WaterClass wc)
+inline void MakeOilrig(TileIndex t, StationID sid, WaterClass wc)
 {
 	MakeStation(t, OWNER_NONE, sid, STATION_OILRIG, 0, wc);
 }