Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do no try opening audio streams when the '-nosound' option is specified

Browse Source 
When the option was specified, many messages were spamming the console in debug mode "Error opening stream X.osf on channel Y."
This commit is contained in:
Louis Gombert 2024-10-26 18:43:51 +02:00
parent 496b2ed7c9
commit a8e88b624d
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Descent3/init.cpp
View File

@ -1912,7 +1912,7 @@ void InitD3Systems2(bool editor) {
// the remaining sound system // the remaining sound system
InitVoices(); InitVoices();
InitD3Music(FindArg("-nomusic") ? false : true); InitD3Music(FindArg("-nomusic") || FindArg("-nosound") ? false : true);
InitAmbientSoundSystem(); InitAmbientSoundSystem();
InitGameSystems(editor); InitGameSystems(editor);

4
editor/gameeditor.cpp
View File

@ -886,7 +886,7 @@ void InitEditGameSystems() {
ddio_MouseMode(MOUSE_EXCLUSIVE_MODE); ddio_MouseMode(MOUSE_EXCLUSIVE_MODE);
// Sound initialization // Sound initialization
InitD3Music(FindArg("-nomusic") ? false : true); InitD3Music(FindArg("-nomusic") || FindArg("-nosound") ? false : true);
Sound_system.InitSoundLib(Descent, Sound_mixer, Sound_quality, false); Sound_system.InitSoundLib(Descent, Sound_mixer, Sound_quality, false);
// UI init. // UI init.
@ -925,7 +925,7 @@ void InitGameEditSystems() {
ddio_MouseMode(MOUSE_STANDARD_MODE); ddio_MouseMode(MOUSE_STANDARD_MODE);
// Sound initialization for editor // 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); Sound_system.InitSoundLib(Descent, Sound_mixer, Sound_quality, false);
NewUIClose(); NewUIClose();

1
music/sequencer.cpp
View File

@ -395,7 +395,6 @@ next_ins:
// skip instructions until error is cleared. // skip instructions until error is cleared.
if (!err) { 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); LOG_WARNING.printf("Error opening stream %s on channel %d.", name, m_dominant_strm);
strm->error = true; strm->error = true;
} }