Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/Audio/GameAudio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void AudioManager::init()

// determine if one of the music tracks exists. Since their now BIGd, one implies all.
// If they don't exist, then attempt to load them from the CD.
if (!isMusicAlreadyLoaded())
if (!TheGlobalData->m_headless && !isMusicAlreadyLoaded())
{
m_musicPlayingFromCD = TRUE;
while (TRUE)
Expand Down
11 changes: 8 additions & 3 deletions Generals/Code/GameEngine/Source/Common/System/Debug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,16 @@ static void doStackDump();
// ----------------------------------------------------------------------------
inline Bool ignoringAsserts()
{
if (!DX8Wrapper_IsWindowed)
return true;
if (TheGlobalData && TheGlobalData->m_headless)
return true;
#ifdef DEBUG_CRASHING
return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts);
#else
return !DX8Wrapper_IsWindowed;
if (TheGlobalData && TheGlobalData->m_debugIgnoreAsserts)
return true;
#endif

return false;
}

// ----------------------------------------------------------------------------
Expand Down
11 changes: 8 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/Common/System/Debug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,16 @@ static void doStackDump();
// ----------------------------------------------------------------------------
inline Bool ignoringAsserts()
{
if (!DX8Wrapper_IsWindowed)
return true;
if (TheGlobalData && TheGlobalData->m_headless)
return true;
#ifdef DEBUG_CRASHING
return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts);
#else
return !DX8Wrapper_IsWindowed;
if (TheGlobalData && TheGlobalData->m_debugIgnoreAsserts)
return true;
#endif

return false;
}

// ----------------------------------------------------------------------------
Expand Down
Loading