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

Move most gScenario* globals to GameState_t

Browse Source
This commit is contained in:
Michael Steenbeek
2024-01-24 22:17:32 +01:00
committed by GitHub
parent d4b0c2e115
commit 115e7389a9
23 changed files with 308 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/Editor.cpp
View File

@@ -104,19 +104,20 @@ namespace Editor
*/
void Load()
{
auto& gameState = GetGameState();
OpenRCT2::Audio::StopAll();
ObjectListLoad();
OpenRCT2::GetContext()->GetGameState()->InitAll(DEFAULT_MAP_SIZE);
gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR;
gEditorStep = EditorStep::ObjectSelection;
GetGameState().ParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
gScenarioCategory = SCENARIO_CATEGORY_OTHER;
gameState.ParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
gameState.ScenarioCategory = SCENARIO_CATEGORY_OTHER;
ViewportInitAll();
WindowBase* mainWindow = OpenEditorWindows();
mainWindow->SetLocation(TileCoordsXYZ{ 75, 75, 14 }.ToCoordsXYZ());
LoadPalette();
gScreenAge = 0;
gScenarioName = LanguageGetString(STR_MY_NEW_SCENARIO);
gameState.ScenarioName = LanguageGetString(STR_MY_NEW_SCENARIO);
}
/**
@@ -144,11 +145,12 @@ namespace Editor
return;
}
ScenarioReset();
auto& gameState = GetGameState();
ScenarioReset(gameState);
gScreenFlags = SCREEN_FLAGS_SCENARIO_EDITOR;
gEditorStep = EditorStep::ObjectiveSelection;
gScenarioCategory = SCENARIO_CATEGORY_OTHER;
gameState.ScenarioCategory = SCENARIO_CATEGORY_OTHER;
ViewportInitAll();
OpenEditorWindows();
FinaliseMainView();