mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor Context constructor

This commit is contained in:
Aaron van Geffen 2024-04-23 19:52:52 +02:00 committed by GitHub
parent 30d314e463
commit ddc386b186
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/Context.cpp
View File

@ -159,12 +159,19 @@ namespace OpenRCT2
, _audioContext(audioContext)
, _uiContext(uiContext)
, _localisationService(std::make_unique<LocalisationService>(env))
, _objectRepository(CreateObjectRepository(_env))
, _objectManager(CreateObjectManager(*_objectRepository))
, _trackDesignRepository(CreateTrackDesignRepository(_env))
, _scenarioRepository(CreateScenarioRepository(_env))
, _replayManager(CreateReplayManager())
, _gameStateSnapshots(CreateGameStateSnapshots())
#ifdef ENABLE_SCRIPTING
, _scriptEngine(_stdInOutConsole, *env)
#endif
#ifndef DISABLE_NETWORK
, _network(*this)
#endif
, _titleScreen(std::make_unique<TitleScreen>())
, _painter(std::make_unique<Painter>(uiContext))
{
// Can't have more than one context currently.
@ -379,12 +386,6 @@ namespace OpenRCT2
_env->SetBasePath(DIRBASE::RCT2, rct2InstallPath);
}
_objectRepository = CreateObjectRepository(_env);
_objectManager = CreateObjectManager(*_objectRepository);
_trackDesignRepository = CreateTrackDesignRepository(_env);
_scenarioRepository = CreateScenarioRepository(_env);
_replayManager = CreateReplayManager();
_gameStateSnapshots = CreateGameStateSnapshots();
if (!gOpenRCT2Headless)
{
_assetPackManager = std::make_unique<AssetPackManager>();
@ -478,7 +479,6 @@ namespace OpenRCT2
_scriptEngine.Initialise();
#endif
_titleScreen = std::make_unique<TitleScreen>();
_uiContext->Initialise();
return true;