File tree Expand file tree Collapse file tree 3 files changed +17
-7
lines changed
Core/GameEngine/Source/Common/Audio
GeneralsMD/Code/GameEngine/Source/Common/System
Generals/Code/GameEngine/Source/Common/System Expand file tree Collapse file tree 3 files changed +17
-7
lines changed Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ void AudioManager::init()
232
232
233
233
// determine if one of the music tracks exists. Since their now BIGd, one implies all.
234
234
// If they don't exist, then attempt to load them from the CD.
235
- if (!isMusicAlreadyLoaded ())
235
+ if (!TheGlobalData-> m_headless && ! isMusicAlreadyLoaded ())
236
236
{
237
237
m_musicPlayingFromCD = TRUE ;
238
238
while (TRUE )
Original file line number Diff line number Diff line change @@ -148,11 +148,16 @@ static void doStackDump();
148
148
// ----------------------------------------------------------------------------
149
149
inline Bool ignoringAsserts ()
150
150
{
151
+ if (!DX8Wrapper_IsWindowed)
152
+ return true ;
153
+ if (TheGlobalData && TheGlobalData->m_headless )
154
+ return true ;
151
155
#ifdef DEBUG_CRASHING
152
- return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts );
153
- #else
154
- return !DX8Wrapper_IsWindowed;
156
+ if (TheGlobalData && TheGlobalData->m_debugIgnoreAsserts )
157
+ return true ;
155
158
#endif
159
+
160
+ return false ;
156
161
}
157
162
158
163
// ----------------------------------------------------------------------------
Original file line number Diff line number Diff line change @@ -149,11 +149,16 @@ static void doStackDump();
149
149
// ----------------------------------------------------------------------------
150
150
inline Bool ignoringAsserts ()
151
151
{
152
+ if (!DX8Wrapper_IsWindowed)
153
+ return true ;
154
+ if (TheGlobalData && TheGlobalData->m_headless )
155
+ return true ;
152
156
#ifdef DEBUG_CRASHING
153
- return !DX8Wrapper_IsWindowed || (TheGlobalData&&TheGlobalData->m_debugIgnoreAsserts );
154
- #else
155
- return !DX8Wrapper_IsWindowed;
157
+ if (TheGlobalData && TheGlobalData->m_debugIgnoreAsserts )
158
+ return true ;
156
159
#endif
160
+
161
+ return false ;
157
162
}
158
163
159
164
// ----------------------------------------------------------------------------
You can’t perform that action at this time.
0 commit comments