diff options
| author | aap <aap@papnet.eu> | 2020-05-24 10:47:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 10:47:17 +0200 |
| commit | 19a0c8b462a6aa6858f8447b171b53a80106ea22 (patch) | |
| tree | 40ac418dc725d9d17fd22d7b445029977e0ef7c5 /src/core/Game.cpp | |
| parent | Merge pull request #582 from Nick007J/miami (diff) | |
| parent | Menu borders and weapon fixes (diff) | |
| download | re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.gz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.bz2 re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.lz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.xz re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.tar.zst re3-19a0c8b462a6aa6858f8447b171b53a80106ea22.zip | |
Diffstat (limited to 'src/core/Game.cpp')
| -rw-r--r-- | src/core/Game.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 02648b27..72b09feb 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -544,7 +544,14 @@ void CGame::InitialiseWhenRestarting(void) CTimer::Initialise(); CSprite2d::SetRecipNearClip(); - + + if (b_FoundRecentSavedGameWantToLoad || FrontEndMenuManager.m_bWantToLoad) + { + LoadSplash("splash1"); + if (FrontEndMenuManager.m_bWantToLoad) + FrontEndMenuManager.MessageScreen("FELD_WR", true); + } + b_FoundRecentSavedGameWantToLoad = false; TheCamera.Init(); @@ -671,14 +678,8 @@ void CGame::Process(void) void CGame::InitAfterFocusLoss() { - /* - byte_869656 = byte_86969D; - result = cDMAudio::SetCurrent3DProvider(byte_86969D); - if ( !bGameStarted && !bMenuVisible ) - byte_869642 = 1; - */ - - //cDMAudio::SetCurrent3DProvider( ? ? ? ); + FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = FrontEndMenuManager.m_lastWorking3DAudioProvider; + DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_lastWorking3DAudioProvider); if (!FrontEndMenuManager.m_bGameNotLoaded && !FrontEndMenuManager.m_bMenuActive) FrontEndMenuManager.m_bStartUpFrontEndRequested = true; |