diff --git a/contributors.md b/contributors.md index 6540ce149b..77ccced4a3 100644 --- a/contributors.md +++ b/contributors.md @@ -164,6 +164,7 @@ The following people are not part of the development team, but have been contrib * (evilclownattack) * Adam Bloom (adam-bloom) * Geoff B. (geoff-B) +* Ryan D. (rctdude2) ## Toolchain * (Balletie) - macOS diff --git a/src/openrct2/actions/ParkMarketingAction.cpp b/src/openrct2/actions/ParkMarketingAction.cpp index 30cc1693c0..aa9c2abda4 100644 --- a/src/openrct2/actions/ParkMarketingAction.cpp +++ b/src/openrct2/actions/ParkMarketingAction.cpp @@ -28,6 +28,13 @@ ParkMarketingAction::ParkMarketingAction(int32_t type, int32_t item, int32_t num { } +void ParkMarketingAction::AcceptParameters(GameActionParameterVisitor& visitor) +{ + visitor.Visit("type", _type); + visitor.Visit("item", _item); + visitor.Visit("duration", _numWeeks); +} + uint16_t ParkMarketingAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; diff --git a/src/openrct2/actions/ParkMarketingAction.h b/src/openrct2/actions/ParkMarketingAction.h index 3ca33f35ed..0af79e725f 100644 --- a/src/openrct2/actions/ParkMarketingAction.h +++ b/src/openrct2/actions/ParkMarketingAction.h @@ -22,6 +22,8 @@ public: ParkMarketingAction() = default; ParkMarketingAction(int32_t type, int32_t item, int32_t numWeeks); + void AcceptParameters(GameActionParameterVisitor & visitor) override; + uint16_t GetActionFlags() const override; void Serialise(DataSerialiser & stream) override; diff --git a/src/openrct2/actions/ParkSetDateAction.cpp b/src/openrct2/actions/ParkSetDateAction.cpp index 4127662dac..94f90664b8 100644 --- a/src/openrct2/actions/ParkSetDateAction.cpp +++ b/src/openrct2/actions/ParkSetDateAction.cpp @@ -24,6 +24,13 @@ ParkSetDateAction::ParkSetDateAction(int32_t year, int32_t month, int32_t day) { } +void ParkSetDateAction::AcceptParameters(GameActionParameterVisitor& visitor) +{ + visitor.Visit("year", _year); + visitor.Visit("month", _month); + visitor.Visit("day", _day); +} + uint16_t ParkSetDateAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; diff --git a/src/openrct2/actions/ParkSetDateAction.h b/src/openrct2/actions/ParkSetDateAction.h index 12f94f4eb1..20d76a5ce3 100644 --- a/src/openrct2/actions/ParkSetDateAction.h +++ b/src/openrct2/actions/ParkSetDateAction.h @@ -22,6 +22,8 @@ public: ParkSetDateAction() = default; ParkSetDateAction(int32_t year, int32_t month, int32_t day); + void AcceptParameters(GameActionParameterVisitor & visitor) override; + uint16_t GetActionFlags() const override; void Serialise(DataSerialiser & stream) override; diff --git a/src/openrct2/actions/ParkSetLoanAction.cpp b/src/openrct2/actions/ParkSetLoanAction.cpp index e1d94308b0..e40049f76b 100644 --- a/src/openrct2/actions/ParkSetLoanAction.cpp +++ b/src/openrct2/actions/ParkSetLoanAction.cpp @@ -22,6 +22,11 @@ ParkSetLoanAction::ParkSetLoanAction(money32 value) { } +void ParkSetLoanAction::AcceptParameters(GameActionParameterVisitor& visitor) +{ + visitor.Visit("value", _value); +} + uint16_t ParkSetLoanAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; diff --git a/src/openrct2/actions/ParkSetLoanAction.h b/src/openrct2/actions/ParkSetLoanAction.h index 9c53e8a018..43f4692ea2 100644 --- a/src/openrct2/actions/ParkSetLoanAction.h +++ b/src/openrct2/actions/ParkSetLoanAction.h @@ -20,6 +20,8 @@ public: ParkSetLoanAction() = default; ParkSetLoanAction(money32 value); + void AcceptParameters(GameActionParameterVisitor & visitor) override; + uint16_t GetActionFlags() const override; void Serialise(DataSerialiser & stream) override; diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.cpp b/src/openrct2/actions/SetParkEntranceFeeAction.cpp index 1ca2c0ce49..f8ff2fff87 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.cpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.cpp @@ -20,6 +20,11 @@ SetParkEntranceFeeAction::SetParkEntranceFeeAction(money16 fee) { } +void SetParkEntranceFeeAction::AcceptParameters(GameActionParameterVisitor& visitor) +{ + visitor.Visit("value", _fee); +} + uint16_t SetParkEntranceFeeAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.h b/src/openrct2/actions/SetParkEntranceFeeAction.h index 6ffc8fc284..5fb8b280a8 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.h +++ b/src/openrct2/actions/SetParkEntranceFeeAction.h @@ -20,6 +20,8 @@ public: SetParkEntranceFeeAction() = default; SetParkEntranceFeeAction(money16 fee); + void AcceptParameters(GameActionParameterVisitor & visitor) override; + uint16_t GetActionFlags() const override; void Serialise(DataSerialiser & stream) override; diff --git a/src/openrct2/actions/SignSetNameAction.cpp b/src/openrct2/actions/SignSetNameAction.cpp index 15bec943b1..e58b2ffc52 100644 --- a/src/openrct2/actions/SignSetNameAction.cpp +++ b/src/openrct2/actions/SignSetNameAction.cpp @@ -26,6 +26,12 @@ SignSetNameAction::SignSetNameAction(BannerIndex bannerIndex, const std::string& { } +void SignSetNameAction::AcceptParameters(GameActionParameterVisitor& visitor) +{ + visitor.Visit("id", _bannerIndex); + visitor.Visit("name", _name); +} + uint16_t SignSetNameAction::GetActionFlags() const { return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused; diff --git a/src/openrct2/actions/SignSetNameAction.h b/src/openrct2/actions/SignSetNameAction.h index 0affa91edc..4c99862368 100644 --- a/src/openrct2/actions/SignSetNameAction.h +++ b/src/openrct2/actions/SignSetNameAction.h @@ -21,6 +21,8 @@ public: SignSetNameAction() = default; SignSetNameAction(BannerIndex bannerIndex, const std::string& name); + void AcceptParameters(GameActionParameterVisitor & visitor) override; + uint16_t GetActionFlags() const override; void Serialise(DataSerialiser & stream) override; diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index 35fa413c15..7f16e74c42 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -46,7 +46,7 @@ namespace OpenRCT2 namespace OpenRCT2::Scripting { - static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 27; + static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 28; # ifndef DISABLE_NETWORK class ScSocketBase;