Skip to content

Commit 5ef7985

Browse files
authored
fix(gameengine): Remove music tracks as prerequisite to initialize the game engine (TheSuperHackers#2737)
1 parent 7dc2632 commit 5ef7985

6 files changed

Lines changed: 0 additions & 39 deletions

File tree

Core/GameEngine/Include/Common/GameAudio.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ class AudioManager : public SubsystemInterface
296296
// For the file cache to know when to remove files.
297297
virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0;
298298

299-
virtual Bool isMusicAlreadyLoaded() const;
300-
301299
Bool getDisallowSpeech() const { return m_disallowSpeech; }
302300
void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; }
303301

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -944,33 +944,6 @@ Real AudioManager::getAudioLengthMS( const AudioEventRTS *event )
944944
getFileLengthMS(tmpEvent.getDecayFilename());
945945
}
946946

947-
//-------------------------------------------------------------------------------------------------
948-
Bool AudioManager::isMusicAlreadyLoaded() const
949-
{
950-
const AudioEventInfo *musicToLoad = nullptr;
951-
AudioEventInfoHash::const_iterator it;
952-
for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
953-
if (it->second) {
954-
const AudioEventInfo *aet = it->second;
955-
if (aet->m_soundType == AT_Music) {
956-
musicToLoad = aet;
957-
}
958-
}
959-
}
960-
961-
if (!musicToLoad) {
962-
return FALSE;
963-
}
964-
965-
AudioEventRTS aud;
966-
aud.setAudioEventInfo(musicToLoad);
967-
aud.generateFilename();
968-
969-
AsciiString astr = aud.getFilename();
970-
971-
return (TheFileSystem->doesFileExist(astr.str()));
972-
}
973-
974947
//-------------------------------------------------------------------------------------------------
975948
void AudioManager::findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents )
976949
{

Generals/Code/GameEngine/Source/Common/GameEngine.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ void GameEngine::init()
441441
initSubsystem(TheGlobalLanguageData,"TheGlobalLanguageData",MSGNEW("GameEngineSubsystem") GlobalLanguage, nullptr); // must be before the game text
442442
TheGlobalLanguageData->parseCustomDefinition();
443443
initSubsystem(TheAudio,"TheAudio", createAudioManager(TheGlobalData->m_headless), nullptr);
444-
if (!TheAudio->isMusicAlreadyLoaded())
445-
setQuitting(TRUE);
446444

447445
#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
448446
TheNameKeyGenerator->syncNameKeyID();

Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,6 @@ BOOL CWorldBuilderApp::InitInstance()
367367

368368
initSubsystem(TheScriptEngine, (ScriptEngine*)(new ScriptEngine()));
369369
initSubsystem(TheAudio, (AudioManager*)new MilesAudioManager());
370-
if (!TheAudio->isMusicAlreadyLoaded())
371-
return FALSE;
372-
373370
initSubsystem(TheVideoPlayer, (VideoPlayerInterface*)(new VideoPlayer()));
374371
initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory()));
375372
initSubsystem(TheSidesList, new SidesList());

GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,6 @@ void GameEngine::init()
526526
DEBUG_LOG(("%s", Buf));////////////////////////////////////////////////////////////////////////////
527527
#endif/////////////////////////////////////////////////////////////////////////////////////////////
528528
initSubsystem(TheAudio,"TheAudio", createAudioManager(TheGlobalData->m_headless), nullptr);
529-
if (!TheAudio->isMusicAlreadyLoaded())
530-
setQuitting(TRUE);
531529

532530
#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
533531
TheNameKeyGenerator->syncNameKeyID();

GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,6 @@ BOOL CWorldBuilderApp::InitInstance()
384384
ini.loadFileDirectory( "Data\\Scripts\\Scripts", INI_LOAD_OVERWRITE, nullptr );
385385

386386
initSubsystem(TheAudio, (AudioManager*)new MilesAudioManager());
387-
if (!TheAudio->isMusicAlreadyLoaded())
388-
return FALSE;
389-
390387
initSubsystem(TheVideoPlayer, (VideoPlayerInterface*)(new VideoPlayer()));
391388
initSubsystem(TheModuleFactory, (ModuleFactory*)(new W3DModuleFactory()));
392389
initSubsystem(TheSidesList, new SidesList());

0 commit comments

Comments
 (0)