From 4ff2dbd108b7517b69e7c9b2b51c0926a8a9c1fe Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 15 Dec 2018 23:12:49 +0100 Subject: [PATCH] Automatically expose game action name via macro. --- src/openrct2/actions/BannerSetNameAction.hpp | 4 ++-- src/openrct2/actions/ClimateSetAction.hpp | 4 ++-- src/openrct2/actions/FootpathRemoveAction.hpp | 6 ++--- src/openrct2/actions/GameAction.cpp | 9 ++++--- src/openrct2/actions/GameAction.h | 24 +++++++++++++++++++ src/openrct2/actions/GuestSetNameAction.hpp | 4 ++-- src/openrct2/actions/MazeSetTrackAction.hpp | 4 ++-- src/openrct2/actions/ParkMarketingAction.hpp | 4 ++-- src/openrct2/actions/ParkSetLoanAction.hpp | 4 ++-- src/openrct2/actions/ParkSetNameAction.hpp | 4 ++-- .../actions/ParkSetResearchFundingAction.hpp | 4 ++-- .../actions/PlaceParkEntranceAction.hpp | 4 ++-- src/openrct2/actions/PlacePeepSpawnAction.hpp | 4 ++-- src/openrct2/actions/RideCreateAction.hpp | 4 ++-- src/openrct2/actions/RideDemolishAction.hpp | 8 +++---- src/openrct2/actions/RideSetColourScheme.hpp | 4 ++-- src/openrct2/actions/RideSetName.hpp | 4 ++-- src/openrct2/actions/RideSetStatus.hpp | 4 ++-- .../actions/SetParkEntranceFeeAction.hpp | 4 ++-- src/openrct2/actions/SignSetNameAction.hpp | 4 ++-- src/openrct2/actions/StaffSetColourAction.hpp | 4 ++-- src/openrct2/actions/StaffSetNameAction.hpp | 4 ++-- src/openrct2/actions/WallRemoveAction.hpp | 4 ++-- src/openrct2/network/Network.cpp | 2 +- 24 files changed, 74 insertions(+), 51 deletions(-) diff --git a/src/openrct2/actions/BannerSetNameAction.hpp b/src/openrct2/actions/BannerSetNameAction.hpp index e6dcaa45e4..f8638adbda 100644 --- a/src/openrct2/actions/BannerSetNameAction.hpp +++ b/src/openrct2/actions/BannerSetNameAction.hpp @@ -20,7 +20,7 @@ #include "../world/Sprite.h" #include "GameAction.h" -struct BannerSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(BannerSetNameAction, GAME_COMMAND_SET_BANNER_NAME, GameActionResult) { private: BannerIndex _bannerIndex; @@ -41,7 +41,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_bannerIndex) << DS_TAG(_name); diff --git a/src/openrct2/actions/ClimateSetAction.hpp b/src/openrct2/actions/ClimateSetAction.hpp index 9ed851ad9a..1613c95bd0 100644 --- a/src/openrct2/actions/ClimateSetAction.hpp +++ b/src/openrct2/actions/ClimateSetAction.hpp @@ -12,7 +12,7 @@ #include "../world/Climate.h" #include "GameAction.h" -struct ClimateSetAction : public GameActionBase +DEFINE_GAME_ACTION(ClimateSetAction, GAME_COMMAND_SET_CLIMATE, GameActionResult) { using climate_t = decltype(gClimate); @@ -31,7 +31,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/FootpathRemoveAction.hpp b/src/openrct2/actions/FootpathRemoveAction.hpp index cf4304f88c..61eaed8dbf 100644 --- a/src/openrct2/actions/FootpathRemoveAction.hpp +++ b/src/openrct2/actions/FootpathRemoveAction.hpp @@ -21,7 +21,7 @@ #include "../world/Wall.h" #include "GameAction.h" -struct FootpathRemoveAction : public GameActionBase +DEFINE_GAME_ACTION(FootpathRemoveAction, GAME_COMMAND_REMOVE_PATH, GameActionResult) { private: int32_t _x; @@ -42,7 +42,7 @@ public: return GameAction::GetActionFlags(); } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); @@ -126,7 +126,7 @@ private: return footpathElement; } - money32 GetRefundPrice(TileElement* footpathElement) const + money32 GetRefundPrice(TileElement * footpathElement) const { money32 cost = -MONEY(10, 00); diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index fbe9c8c75e..628d4d5524 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -146,7 +146,7 @@ namespace GameActions return "cl"; else if (network_get_mode() == NETWORK_MODE_SERVER) return "sv"; - return ""; + return "sp"; } struct ActionLogContext_t @@ -159,7 +159,7 @@ namespace GameActions MemoryStream& output = ctx.output; char temp[128] = {}; - snprintf(temp, sizeof(temp), "[%s] Game Action %08X (", GetRealm(), action->GetType()); + snprintf(temp, sizeof(temp), "[%s] GA: %s (%08X) (", GetRealm(), action->GetName(), action->GetType()); output.Write(temp, strlen(temp)); @@ -208,8 +208,7 @@ namespace GameActions // As a client we have to wait or send it first. if (!(actionFlags & GA_FLAGS::CLIENT_ONLY) && !(flags & GAME_COMMAND_FLAG_NETWORKED)) { - log_verbose("[%s] GameAction::Execute\n", "cl"); - + log_verbose("[%s] GameAction::Execute %s (Out)", GetRealm(), action->GetName()); network_send_game_action(action); return result; @@ -221,7 +220,7 @@ namespace GameActions // at the beginning of the frame, so we have to put them into the queue. if (!(actionFlags & GA_FLAGS::CLIENT_ONLY) && !(flags & GAME_COMMAND_FLAG_NETWORKED)) { - log_verbose("[%s] GameAction::Execute\n", "sv-cl"); + log_verbose("[%s] GameAction::Execute %s (Queue)", GetRealm(), action->GetName()); network_enqueue_game_action(action); return result; diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index 40bbf66213..31c27fb375 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -103,6 +103,8 @@ public: virtual ~GameAction() = default; + virtual const char* GetName() const = 0; + NetworkPlayerId_t GetPlayer() const { return _playerId; @@ -198,6 +200,10 @@ public: # pragma GCC diagnostic pop #endif +template struct GameActionNameQuery +{ +}; + template struct GameActionBase : GameAction { public: @@ -210,6 +216,11 @@ public: { } + virtual const char* GetName() const override + { + return GameActionNameQuery::Name(); + } + void SetCallback(std::function typedCallback) { GameAction::SetCallback([typedCallback](const GameAction* ga, const GameActionResult* result) { @@ -241,4 +252,17 @@ namespace GameActions Register(T::TYPE, factory); return factory; } + + // clang-format off +#define DEFINE_GAME_ACTION(cls, id, res) \ + template<> struct GameActionNameQuery \ + { \ + static const char* Name() \ + { \ + return #cls; \ + } \ + }; \ + struct cls : public GameActionBase + // clang-format on + } // namespace GameActions diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp index 9c761ad48f..e2fceae83b 100644 --- a/src/openrct2/actions/GuestSetNameAction.hpp +++ b/src/openrct2/actions/GuestSetNameAction.hpp @@ -21,7 +21,7 @@ #include "../world/Sprite.h" #include "GameAction.h" -struct GuestSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(GuestSetNameAction, GAME_COMMAND_SET_GUEST_NAME, GameActionResult) { private: uint16_t _spriteIndex; @@ -42,7 +42,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp index 418105f749..f8a47b4653 100644 --- a/src/openrct2/actions/MazeSetTrackAction.hpp +++ b/src/openrct2/actions/MazeSetTrackAction.hpp @@ -48,7 +48,7 @@ static constexpr const uint8_t byte_993D0C[] = { }; // clang-format on -struct MazeSetTrackAction : public GameActionBase +DEFINE_GAME_ACTION(MazeSetTrackAction, GAME_COMMAND_SET_MAZE_TRACK, GameActionResult) { private: uint16_t _x; @@ -75,7 +75,7 @@ public: { } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/ParkMarketingAction.hpp b/src/openrct2/actions/ParkMarketingAction.hpp index f91a0864d2..8f28965559 100644 --- a/src/openrct2/actions/ParkMarketingAction.hpp +++ b/src/openrct2/actions/ParkMarketingAction.hpp @@ -22,7 +22,7 @@ #include -struct ParkMarketingAction : public GameActionBase +DEFINE_GAME_ACTION(ParkMarketingAction, GAME_COMMAND_START_MARKETING_CAMPAIGN, GameActionResult) { private: int32_t _type; @@ -45,7 +45,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_type) << DS_TAG(_item) << DS_TAG(_numWeeks); diff --git a/src/openrct2/actions/ParkSetLoanAction.hpp b/src/openrct2/actions/ParkSetLoanAction.hpp index 136064c782..d92587db82 100644 --- a/src/openrct2/actions/ParkSetLoanAction.hpp +++ b/src/openrct2/actions/ParkSetLoanAction.hpp @@ -18,7 +18,7 @@ #include "../windows/Intent.h" #include "GameAction.h" -struct ParkSetLoanAction : public GameActionBase +DEFINE_GAME_ACTION(ParkSetLoanAction, GAME_COMMAND_SET_CURRENT_LOAN, GameActionResult) { private: money32 _value; @@ -37,7 +37,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_value); diff --git a/src/openrct2/actions/ParkSetNameAction.hpp b/src/openrct2/actions/ParkSetNameAction.hpp index 49b2d01475..acf2d50728 100644 --- a/src/openrct2/actions/ParkSetNameAction.hpp +++ b/src/openrct2/actions/ParkSetNameAction.hpp @@ -22,7 +22,7 @@ #include "../world/Park.h" #include "GameAction.h" -struct ParkSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(ParkSetNameAction, GAME_COMMAND_SET_PARK_NAME, GameActionResult) { private: std::string _name; @@ -41,7 +41,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_name); diff --git a/src/openrct2/actions/ParkSetResearchFundingAction.hpp b/src/openrct2/actions/ParkSetResearchFundingAction.hpp index fc49ca4e93..641f564967 100644 --- a/src/openrct2/actions/ParkSetResearchFundingAction.hpp +++ b/src/openrct2/actions/ParkSetResearchFundingAction.hpp @@ -18,7 +18,7 @@ #include "../windows/Intent.h" #include "GameAction.h" -struct ParkSetResearchFundingAction : public GameActionBase +DEFINE_GAME_ACTION(ParkSetResearchFundingAction, GAME_COMMAND_SET_RESEARCH_FUNDING, GameActionResult) { private: // TODO change to std::optional when C++17 @@ -40,7 +40,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_priorities) << DS_TAG(_fundingAmount); diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 8615887faa..d97401f6e3 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -22,7 +22,7 @@ #include "../world/Surface.h" #include "GameAction.h" -struct PlaceParkEntranceAction : public GameActionBase +DEFINE_GAME_ACTION(PlaceParkEntranceAction, GAME_COMMAND_PLACE_PARK_ENTRANCE, GameActionResult) { private: int16_t _x; @@ -47,7 +47,7 @@ public: return GameActionBase::GetActionFlags() | GA_FLAGS::EDITOR_ONLY; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/PlacePeepSpawnAction.hpp b/src/openrct2/actions/PlacePeepSpawnAction.hpp index d7799e7f17..d2ea7f1906 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.hpp +++ b/src/openrct2/actions/PlacePeepSpawnAction.hpp @@ -21,7 +21,7 @@ static int32_t _nextPeepSpawnIndex = 0; -struct PlacePeepSpawnAction : public GameActionBase +DEFINE_GAME_ACTION(PlacePeepSpawnAction, GAME_COMMAND_PLACE_PEEP_SPAWN, GameActionResult) { private: CoordsXYZD _location; @@ -40,7 +40,7 @@ public: return GameActionBase::GetActionFlags() | GA_FLAGS::EDITOR_ONLY | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 7c7e638cb9..b38ac58862 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -41,7 +41,7 @@ public: int32_t rideIndex = -1; }; -struct RideCreateAction : public GameActionBase +DEFINE_GAME_ACTION(RideCreateAction, GAME_COMMAND_CREATE_RIDE, RideCreateGameActionResult) { private: int32_t _rideType; @@ -66,7 +66,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index 8d28343244..4af3057157 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -28,7 +28,7 @@ using namespace OpenRCT2; -struct RideDemolishAction : public GameActionBase +DEFINE_GAME_ACTION(RideDemolishAction, GAME_COMMAND_DEMOLISH_RIDE, GameActionResult) { private: NetworkRideId_t _rideIndex{ -1 }; @@ -44,7 +44,7 @@ public: { } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); @@ -117,7 +117,7 @@ public: } private: - GameActionResult::Ptr DemolishRide(Ride* ride) const + GameActionResult::Ptr DemolishRide(Ride * ride) const { money32 refundPrice = DemolishTracks(); @@ -356,7 +356,7 @@ private: return refundPrice; } - GameActionResult::Ptr RefurbishRide(Ride* ride) const + GameActionResult::Ptr RefurbishRide(Ride * ride) const { auto res = std::make_unique(); res->ExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION; diff --git a/src/openrct2/actions/RideSetColourScheme.hpp b/src/openrct2/actions/RideSetColourScheme.hpp index 4ae5a8c5a6..a91a0255d1 100644 --- a/src/openrct2/actions/RideSetColourScheme.hpp +++ b/src/openrct2/actions/RideSetColourScheme.hpp @@ -21,7 +21,7 @@ #include "../world/Sprite.h" #include "GameAction.h" -struct RideSetColourSchemeAction : public GameActionBase +DEFINE_GAME_ACTION(RideSetColourSchemeAction, GAME_COMMAND_SET_COLOUR_SCHEME, GameActionResult) { private: int32_t _x = 0, _y = 0, _z = 0, _direction = 0, _trackType = 0; @@ -44,7 +44,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index 07012f63d8..a810ae66c2 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -22,7 +22,7 @@ #include "../world/Park.h" #include "GameAction.h" -struct RideSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(RideSetNameAction, GAME_COMMAND_SET_RIDE_NAME, GameActionResult) { private: NetworkRideId_t _rideIndex{ -1 }; @@ -43,7 +43,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index 50c6ef1a0d..8d5a2f5b90 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -27,7 +27,7 @@ static rct_string_id _StatusErrorTitles[] = { STR_CANT_TEST, }; -struct RideSetStatusAction : public GameActionBase +DEFINE_GAME_ACTION(RideSetStatusAction, GAME_COMMAND_SET_RIDE_STATUS, GameActionResult) { private: NetworkRideId_t _rideIndex{ -1 }; @@ -48,7 +48,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.hpp b/src/openrct2/actions/SetParkEntranceFeeAction.hpp index e4e11e6915..58e1d8cc9f 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.hpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.hpp @@ -16,7 +16,7 @@ #include "../world/Park.h" #include "GameAction.h" -struct SetParkEntranceFeeAction : public GameActionBase +DEFINE_GAME_ACTION(SetParkEntranceFeeAction, GAME_COMMAND_SET_PARK_ENTRANCE_FEE, GameActionResult) { private: money16 _fee; @@ -35,7 +35,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/SignSetNameAction.hpp b/src/openrct2/actions/SignSetNameAction.hpp index dc6dde7a6a..89b30ebc62 100644 --- a/src/openrct2/actions/SignSetNameAction.hpp +++ b/src/openrct2/actions/SignSetNameAction.hpp @@ -21,7 +21,7 @@ #include -struct SignSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(SignSetNameAction, GAME_COMMAND_SET_SIGN_NAME, GameActionResult) { private: int32_t _bannerIndex; @@ -40,7 +40,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_bannerIndex) << DS_TAG(_name); diff --git a/src/openrct2/actions/StaffSetColourAction.hpp b/src/openrct2/actions/StaffSetColourAction.hpp index 19ad0e8804..f56813f90d 100644 --- a/src/openrct2/actions/StaffSetColourAction.hpp +++ b/src/openrct2/actions/StaffSetColourAction.hpp @@ -20,7 +20,7 @@ #include "../world/Sprite.h" #include "GameAction.h" -struct StaffSetColourAction : public GameActionBase +DEFINE_GAME_ACTION(StaffSetColourAction, GAME_COMMAND_SET_STAFF_COLOUR, GameActionResult) { private: uint8_t _staffType; @@ -41,7 +41,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); stream << DS_TAG(_staffType) << DS_TAG(_colour); diff --git a/src/openrct2/actions/StaffSetNameAction.hpp b/src/openrct2/actions/StaffSetNameAction.hpp index 5be715b9c5..e959da648b 100644 --- a/src/openrct2/actions/StaffSetNameAction.hpp +++ b/src/openrct2/actions/StaffSetNameAction.hpp @@ -22,7 +22,7 @@ #include "../world/Sprite.h" #include "GameAction.h" -struct StaffSetNameAction : public GameActionBase +DEFINE_GAME_ACTION(StaffSetNameAction, GAME_COMMAND_SET_STAFF_NAME, GameActionResult) { private: uint16_t _spriteIndex; @@ -43,7 +43,7 @@ public: return GameAction::GetActionFlags() | GA_FLAGS::ALLOW_WHILE_PAUSED; } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/actions/WallRemoveAction.hpp b/src/openrct2/actions/WallRemoveAction.hpp index 64a11559a0..4746113587 100644 --- a/src/openrct2/actions/WallRemoveAction.hpp +++ b/src/openrct2/actions/WallRemoveAction.hpp @@ -19,7 +19,7 @@ #include "../world/Wall.h" #include "GameAction.h" -struct WallRemoveAction : public GameActionBase +DEFINE_GAME_ACTION(WallRemoveAction, GAME_COMMAND_REMOVE_WALL, GameActionResult) { private: TileCoordsXYZD _location; @@ -31,7 +31,7 @@ public: { } - void Serialise(DataSerialiser& stream) override + void Serialise(DataSerialiser & stream) override { GameAction::Serialise(stream); diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 38d7e711c2..59e72907fa 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -30,7 +30,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "15" +#define NETWORK_STREAM_VERSION "16" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr;