1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00

Fix some actions for plugins (#14607)

* Fix some actions for plugins

If an action doesn't have an AcceptParameters method, the paramaters passed in executeAction will be ignored and the action will fail.

* Change plugin parameter names

* Increment plugin API version
This commit is contained in:
Ryan
2021-05-09 17:04:03 -04:00
committed by GitHub
parent d46e4a9bb1
commit eb9ed63b0e
12 changed files with 42 additions and 1 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;