Merge pull request #639 from Lgt2x/audio-messages

Do no try opening audio streams when the '-nosound' option is specified
DescentDevelopers · Oct 27, 2024 · 73d2764 · 73d2764
2 parents 496b2ed + a8e88b6
commit 73d2764
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Descent3/init.cpp b/Descent3/init.cpp
@@ -1912,7 +1912,7 @@ void InitD3Systems2(bool editor) {
 
   // the remaining sound system
   InitVoices();
-  InitD3Music(FindArg("-nomusic") ? false : true);
+  InitD3Music(FindArg("-nomusic")  || FindArg("-nosound") ? false : true);
   InitAmbientSoundSystem();
 
   InitGameSystems(editor);

diff --git a/editor/gameeditor.cpp b/editor/gameeditor.cpp
@@ -886,7 +886,7 @@ void InitEditGameSystems() {
   ddio_MouseMode(MOUSE_EXCLUSIVE_MODE);
 
   // Sound initialization
-  InitD3Music(FindArg("-nomusic") ? false : true);
+  InitD3Music(FindArg("-nomusic") || FindArg("-nosound") ? false : true);
   Sound_system.InitSoundLib(Descent, Sound_mixer, Sound_quality, false);
 
   //	UI init.
@@ -925,7 +925,7 @@ void InitGameEditSystems() {
   ddio_MouseMode(MOUSE_STANDARD_MODE);
 
   // Sound initialization for editor
-  InitD3Music(FindArg("-nomusic") ? false : true);
+  InitD3Music(FindArg("-nomusic") || FindArg("-nosound") ? false : true);
   Sound_system.InitSoundLib(Descent, Sound_mixer, Sound_quality, false);
 
   NewUIClose();

diff --git a/music/sequencer.cpp b/music/sequencer.cpp
@@ -395,7 +395,6 @@ void OutrageMusicSeq::ExecScript(music_stream *strm) {
 
       // skip instructions until error is cleared.
       if (!err) {
-        //	mprintf(0, "MUSIC: Error opening stream %s on channel %d.\n", name, m_dominant_strm);
         LOG_WARNING.printf("Error opening stream %s on channel %d.", name, m_dominant_strm);
         strm->error = true;
       }