From 0a99bf7091cac2906cda78a448fd4982ce08c643 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 10 Jan 2025 18:35:12 +0000 Subject: [PATCH] Codechange: NewGRF varaction parameter is 32 bit. --- src/base_station_base.h | 2 +- src/newgrf_station.cpp | 4 ++-- src/station_base.h | 2 +- src/waypoint_base.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/base_station_base.h b/src/base_station_base.h index 72a5bb85ce..5bbffe6ece 100644 --- a/src/base_station_base.h +++ b/src/base_station_base.h @@ -113,7 +113,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> { * @param available will return false if ever the variable asked for does not exist * @return the value stored in the corresponding variable */ - virtual uint32_t GetNewGRFVariable(const struct ResolverObject &object, uint8_t variable, uint8_t parameter, bool &available) const = 0; + virtual uint32_t GetNewGRFVariable(const struct ResolverObject &object, uint8_t variable, uint32_t parameter, bool &available) const = 0; /** * Update the coordinated of the sign (as shown in the viewport). diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index e1547c8ff3..4c4872ad15 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -404,7 +404,7 @@ TownScopeResolver *StationResolverObject::GetTown() return this->st->GetNewGRFVariable(this->ro, variable, parameter, available); } -uint32_t Station::GetNewGRFVariable(const ResolverObject &object, uint8_t variable, uint8_t parameter, bool &available) const +uint32_t Station::GetNewGRFVariable(const ResolverObject &object, uint8_t variable, uint32_t parameter, bool &available) const { switch (variable) { case 0x48: { // Accepted cargo types @@ -470,7 +470,7 @@ uint32_t Station::GetNewGRFVariable(const ResolverObject &object, uint8_t variab return UINT_MAX; } -uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [[maybe_unused]] uint8_t parameter, bool &available) const +uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [[maybe_unused]] uint32_t parameter, bool &available) const { switch (variable) { case 0x48: return 0; // Accepted cargo types diff --git a/src/station_base.h b/src/station_base.h index ea0d4b5465..9d22745986 100644 --- a/src/station_base.h +++ b/src/station_base.h @@ -573,7 +573,7 @@ public: return IsAirportTile(tile) && GetStationIndex(tile) == this->index; } - uint32_t GetNewGRFVariable(const ResolverObject &object, uint8_t variable, uint8_t parameter, bool &available) const override; + uint32_t GetNewGRFVariable(const ResolverObject &object, uint8_t variable, uint32_t parameter, bool &available) const override; void GetTileArea(TileArea *ta, StationType type) const override; }; diff --git a/src/waypoint_base.h b/src/waypoint_base.h index cbf2e1e608..26fc84c759 100644 --- a/src/waypoint_base.h +++ b/src/waypoint_base.h @@ -41,7 +41,7 @@ struct Waypoint final : SpecializedStation { return IsRailWaypointTile(tile) && GetStationIndex(tile) == this->index; } - uint32_t GetNewGRFVariable(const struct ResolverObject &object, uint8_t variable, uint8_t parameter, bool &available) const override; + uint32_t GetNewGRFVariable(const struct ResolverObject &object, uint8_t variable, uint32_t parameter, bool &available) const override; void GetTileArea(TileArea *ta, StationType type) const override;