mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Filter certain game actions from being used in the replay system (#20886)

Browse Source
This commit is contained in:
Matt
2023-10-15 09:22:00 +03:00
committed by GitHub
parent 88608e0b7e
commit c2fe9ef96a
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/actions/GameAction.cpp
View File

@@ -292,11 +292,14 @@ namespace GameActions
uint16_t actionFlags = action->GetActionFlags();
uint32_t flags = action->GetFlags();
// Some actions are not recorded in the replay.
const auto ignoreForReplays = (actionFlags & GameActions::Flags::IgnoreForReplays) != 0;
auto* replayManager = OpenRCT2::GetContext()->GetReplayManager();
if (replayManager != nullptr && (replayManager->IsReplaying() || replayManager->IsNormalising()))
{
// We only accept replay commands as long the replay is active.
if ((flags & GAME_COMMAND_FLAG_REPLAY) == 0)
if ((flags & GAME_COMMAND_FLAG_REPLAY) == 0 && !ignoreForReplays)
{
// TODO: Introduce proper error.
auto result = GameActions::Result();
@@ -403,7 +406,7 @@ namespace GameActions
bool commandExecutes = (flags & GAME_COMMAND_FLAG_GHOST) == 0 && (flags & GAME_COMMAND_FLAG_NO_SPEND) == 0;
bool recordAction = false;
if (replayManager != nullptr)
if (replayManager != nullptr && !ignoreForReplays)
{
if (replayManager->IsRecording() && commandExecutes)
recordAction = true;

1
src/openrct2/actions/GameAction.h
View File

@@ -28,6 +28,7 @@ namespace GameActions
constexpr uint16_t AllowWhilePaused = 1 << 0;
constexpr uint16_t ClientOnly = 1 << 1;
constexpr uint16_t EditorOnly = 1 << 2;
constexpr uint16_t IgnoreForReplays = 1 << 3;
} // namespace Flags
} // namespace GameActions

2
src/openrct2/actions/GameSetSpeedAction.cpp
View File

@@ -23,7 +23,7 @@ void GameSetSpeedAction::AcceptParameters(GameActionParameterVisitor& visitor)
uint16_t GameSetSpeedAction::GetActionFlags() const
{
return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused;
return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused | GameActions::Flags::IgnoreForReplays;
}
void GameSetSpeedAction::Serialise(DataSerialiser& stream)

2
src/openrct2/actions/PauseToggleAction.cpp
View File

@@ -11,7 +11,7 @@
uint16_t PauseToggleAction::GetActionFlags() const
{
return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused;
return GameAction::GetActionFlags() | GameActions::Flags::AllowWhilePaused | GameActions::Flags::IgnoreForReplays;
}
GameActions::Result PauseToggleAction::Query() const