mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +01:00
Code Issues Releases Wiki Activity

Pass game state ref as parameter to game actions (#25065)

Browse Source
This commit is contained in:
Aaron van Geffen
2025-09-08 16:21:29 +02:00
committed by GitHub
parent 3e10c20792
commit 4446ff9f6f
227 changed files with 927 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/Game.cpp
View File

@@ -110,7 +110,7 @@ using namespace OpenRCT2;
void GameResetSpeed()
{
auto setSpeedAction = GameActions::GameSetSpeedAction(1);
GameActions::Execute(&setSpeedAction);
GameActions::Execute(&setSpeedAction, getGameState());
}
void GameIncreaseGameSpeed()
@@ -120,7 +120,7 @@ void GameIncreaseGameSpeed()
newSpeed = 8;
auto setSpeedAction = GameActions::GameSetSpeedAction(newSpeed);
GameActions::Execute(&setSpeedAction);
GameActions::Execute(&setSpeedAction, getGameState());
}
void GameReduceGameSpeed()
@@ -130,7 +130,7 @@ void GameReduceGameSpeed()
newSpeed = 4;
auto setSpeedAction = GameActions::GameSetSpeedAction(newSpeed);
GameActions::Execute(&setSpeedAction);
GameActions::Execute(&setSpeedAction, getGameState());
}
/**
@@ -679,12 +679,14 @@ static void NewGameWindowCallback(const utf8* path)
*/
void GameLoadOrQuitNoSavePrompt()
{
auto& gameState = getGameState();
switch (gSavePromptMode)
{
case PromptMode::saveBeforeLoad:
{
auto loadOrQuitAction = GameActions::LoadOrQuitAction(GameActions::LoadOrQuitModes::CloseSavePrompt);
GameActions::Execute(&loadOrQuitAction);
GameActions::Execute(&loadOrQuitAction, gameState);
ToolCancel();
if (gLegacyScene == LegacyScene::scenarioEditor)
{
@@ -703,7 +705,7 @@ void GameLoadOrQuitNoSavePrompt()
case PromptMode::saveBeforeQuit:
{
auto loadOrQuitAction = GameActions::LoadOrQuitAction(GameActions::LoadOrQuitModes::CloseSavePrompt);
GameActions::Execute(&loadOrQuitAction);
GameActions::Execute(&loadOrQuitAction, gameState);
ToolCancel();
if (gInputFlags.has(InputFlag::unk5))
{
@@ -724,7 +726,7 @@ void GameLoadOrQuitNoSavePrompt()
case PromptMode::saveBeforeNewGame:
{
auto loadOrQuitAction = GameActions::LoadOrQuitAction(GameActions::LoadOrQuitModes::CloseSavePrompt);
GameActions::Execute(&loadOrQuitAction);
GameActions::Execute(&loadOrQuitAction, gameState);
ToolCancel();
auto intent = Intent(WindowClass::ScenarioSelect);
intent.PutExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<CloseCallback>(NewGameWindowCallback));