diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h index dae9d7cd132..5c83fd91681 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -296,8 +296,6 @@ class AudioManager : public SubsystemInterface // For the file cache to know when to remove files. virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0; - virtual Bool isMusicAlreadyLoaded() const; - Bool getDisallowSpeech() const { return m_disallowSpeech; } void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; } diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index c1df413bb7a..41be35aeeed 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -944,33 +944,6 @@ Real AudioManager::getAudioLengthMS( const AudioEventRTS *event ) getFileLengthMS(tmpEvent.getDecayFilename()); } -//------------------------------------------------------------------------------------------------- -Bool AudioManager::isMusicAlreadyLoaded() const -{ - const AudioEventInfo *musicToLoad = nullptr; - AudioEventInfoHash::const_iterator it; - for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) { - if (it->second) { - const AudioEventInfo *aet = it->second; - if (aet->m_soundType == AT_Music) { - musicToLoad = aet; - } - } - } - - if (!musicToLoad) { - return FALSE; - } - - AudioEventRTS aud; - aud.setAudioEventInfo(musicToLoad); - aud.generateFilename(); - - AsciiString astr = aud.getFilename(); - - return (TheFileSystem->doesFileExist(astr.str())); -} - //------------------------------------------------------------------------------------------------- void AudioManager::findAllAudioEventsOfType( AudioType audioType, std::vector& allEvents ) { diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index ce2fdf16bac..0350d007b23 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -441,8 +441,6 @@ void GameEngine::init() initSubsystem(TheGlobalLanguageData,"TheGlobalLanguageData",MSGNEW("GameEngineSubsystem") GlobalLanguage, nullptr); // must be before the game text TheGlobalLanguageData->parseCustomDefinition(); initSubsystem(TheAudio,"TheAudio", createAudioManager(TheGlobalData->m_headless), nullptr); - if (!TheAudio->isMusicAlreadyLoaded()) - setQuitting(TRUE); #if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC TheNameKeyGenerator->syncNameKeyID(); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 71d6c44b1f3..b71492898b9 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -367,9 +367,6 @@ BOOL CWorldBuilderApp::InitInstance() initSubsystem(TheScriptEngine, (ScriptEngine*)(new ScriptEngine())); initSubsystem(TheAudio, (AudioManager*)new MilesAudioManager()); - if (!TheAudio->isMusicAlreadyLoaded()) - return FALSE; - initSubsystem(TheVideoPlayer, (VideoPlayerInterface*)(new VideoPlayer())); initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory())); initSubsystem(TheSidesList, new SidesList()); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index a34487538d8..ad861da8d90 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -526,8 +526,6 @@ void GameEngine::init() DEBUG_LOG(("%s", Buf));//////////////////////////////////////////////////////////////////////////// #endif///////////////////////////////////////////////////////////////////////////////////////////// initSubsystem(TheAudio,"TheAudio", createAudioManager(TheGlobalData->m_headless), nullptr); - if (!TheAudio->isMusicAlreadyLoaded()) - setQuitting(TRUE); #if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC TheNameKeyGenerator->syncNameKeyID(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 7efd924e2b1..7f49898e497 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -384,9 +384,6 @@ BOOL CWorldBuilderApp::InitInstance() ini.loadFileDirectory( "Data\\Scripts\\Scripts", INI_LOAD_OVERWRITE, nullptr ); initSubsystem(TheAudio, (AudioManager*)new MilesAudioManager()); - if (!TheAudio->isMusicAlreadyLoaded()) - return FALSE; - initSubsystem(TheVideoPlayer, (VideoPlayerInterface*)(new VideoPlayer())); initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory())); initSubsystem(TheSidesList, new SidesList());