diff options
Diffstat (limited to 'apps/plugins/doom/s_sound.c')
-rw-r--r-- | apps/plugins/doom/s_sound.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/apps/plugins/doom/s_sound.c b/apps/plugins/doom/s_sound.c index c8ed7b2839..4b863b5872 100644 --- a/apps/plugins/doom/s_sound.c +++ b/apps/plugins/doom/s_sound.c | |||
@@ -117,7 +117,7 @@ void S_Init(int sfxVolume,int musicVolume ) | |||
117 | { | 117 | { |
118 | //jff 1/22/98 skip sound init if sound not enabled | 118 | //jff 1/22/98 skip sound init if sound not enabled |
119 | numChannels = default_numChannels; | 119 | numChannels = default_numChannels; |
120 | if (!nosfxparm) | 120 | if (enable_sound) |
121 | { | 121 | { |
122 | int i; | 122 | int i; |
123 | 123 | ||
@@ -154,7 +154,7 @@ void S_Start(void) | |||
154 | { | 154 | { |
155 | int cnum, mnum; | 155 | int cnum, mnum; |
156 | 156 | ||
157 | if (!nosfxparm) | 157 | if (enable_sound) |
158 | { | 158 | { |
159 | // kill all playing sounds at start of level | 159 | // kill all playing sounds at start of level |
160 | // (trust me - a good idea) | 160 | // (trust me - a good idea) |
@@ -198,7 +198,7 @@ void S_StartSoundAtVolume(void *origin_p, int sfx_id, int volume) | |||
198 | sfxinfo_t* sfx; | 198 | sfxinfo_t* sfx; |
199 | mobj_t* origin = (mobj_t *) origin_p; | 199 | mobj_t* origin = (mobj_t *) origin_p; |
200 | 200 | ||
201 | if (nosfxparm) | 201 | if (!enable_sound) |
202 | return; | 202 | return; |
203 | 203 | ||
204 | is_pickup = sfx_id & PICKUP_SOUND || sfx_id == sfx_oof || (compatibility_level >= prboom_2_compatibility && sfx_id == sfx_noway); // killough 4/25/98 | 204 | is_pickup = sfx_id & PICKUP_SOUND || sfx_id == sfx_oof || (compatibility_level >= prboom_2_compatibility && sfx_id == sfx_noway); // killough 4/25/98 |
@@ -295,7 +295,7 @@ void S_StopSound(void *origin) | |||
295 | { | 295 | { |
296 | int cnum; | 296 | int cnum; |
297 | 297 | ||
298 | if (nosfxparm) | 298 | if (!enable_sound) |
299 | return; | 299 | return; |
300 | 300 | ||
301 | for (cnum=0 ; cnum<numChannels ; cnum++) | 301 | for (cnum=0 ; cnum<numChannels ; cnum++) |
@@ -311,7 +311,7 @@ void S_StopSound(void *origin) | |||
311 | // | 311 | // |
312 | void S_PauseSound(void) | 312 | void S_PauseSound(void) |
313 | { | 313 | { |
314 | if (nosfxparm) | 314 | if (!enable_sound) |
315 | return; | 315 | return; |
316 | 316 | ||
317 | if (mus_playing && !mus_paused) | 317 | if (mus_playing && !mus_paused) |
@@ -323,7 +323,7 @@ void S_PauseSound(void) | |||
323 | 323 | ||
324 | void S_ResumeSound(void) | 324 | void S_ResumeSound(void) |
325 | { | 325 | { |
326 | if (nosfxparm) | 326 | if (!enable_sound) |
327 | return; | 327 | return; |
328 | 328 | ||
329 | if (mus_playing && mus_paused) | 329 | if (mus_playing && mus_paused) |
@@ -342,7 +342,7 @@ void S_UpdateSounds(void* listener_p) | |||
342 | 342 | ||
343 | mobj_t* listener = (mobj_t*)listener_p; | 343 | mobj_t* listener = (mobj_t*)listener_p; |
344 | 344 | ||
345 | if (nosfxparm) | 345 | if (!enable_sound) |
346 | return; | 346 | return; |
347 | 347 | ||
348 | for (cnum=0 ; cnum<numChannels ; cnum++) | 348 | for (cnum=0 ; cnum<numChannels ; cnum++) |
@@ -392,7 +392,7 @@ void S_UpdateSounds(void* listener_p) | |||
392 | 392 | ||
393 | void S_SetMusicVolume(int volume) | 393 | void S_SetMusicVolume(int volume) |
394 | { | 394 | { |
395 | if (nosfxparm) | 395 | if (!enable_sound) |
396 | return; | 396 | return; |
397 | 397 | ||
398 | if (volume < 0 || volume > 15) | 398 | if (volume < 0 || volume > 15) |
@@ -403,7 +403,7 @@ void S_SetMusicVolume(int volume) | |||
403 | 403 | ||
404 | void S_SetSfxVolume(int volume) | 404 | void S_SetSfxVolume(int volume) |
405 | { | 405 | { |
406 | if (nosfxparm) | 406 | if (!enable_sound) |
407 | return; | 407 | return; |
408 | 408 | ||
409 | if (volume < 0 || volume > 127) | 409 | if (volume < 0 || volume > 127) |
@@ -416,7 +416,7 @@ void S_SetSfxVolume(int volume) | |||
416 | // | 416 | // |
417 | void S_StartMusic(int m_id) | 417 | void S_StartMusic(int m_id) |
418 | { | 418 | { |
419 | if (nosfxparm) | 419 | if (!enable_sound) |
420 | return; | 420 | return; |
421 | S_ChangeMusic(m_id, false); | 421 | S_ChangeMusic(m_id, false); |
422 | } | 422 | } |
@@ -425,7 +425,7 @@ void S_ChangeMusic(int musicnum, int looping) | |||
425 | { | 425 | { |
426 | musicinfo_t *music; | 426 | musicinfo_t *music; |
427 | 427 | ||
428 | if (nosfxparm) | 428 | if (!enable_sound) |
429 | return; | 429 | return; |
430 | 430 | ||
431 | if (musicnum <= mus_None || musicnum >= NUMMUSIC) | 431 | if (musicnum <= mus_None || musicnum >= NUMMUSIC) |
@@ -464,7 +464,7 @@ void S_ChangeMusic(int musicnum, int looping) | |||
464 | 464 | ||
465 | void S_StopMusic(void) | 465 | void S_StopMusic(void) |
466 | { | 466 | { |
467 | if (nosfxparm) | 467 | if (!enable_sound) |
468 | return; | 468 | return; |
469 | 469 | ||
470 | if (mus_playing) | 470 | if (mus_playing) |
@@ -487,7 +487,7 @@ void S_StopChannel(int cnum) | |||
487 | int i; | 487 | int i; |
488 | channel_t* c = &channels[cnum]; | 488 | channel_t* c = &channels[cnum]; |
489 | 489 | ||
490 | if (nosfxparm) | 490 | if (!enable_sound) |
491 | return; | 491 | return; |
492 | 492 | ||
493 | if (c->sfxinfo) | 493 | if (c->sfxinfo) |
@@ -521,7 +521,7 @@ int S_AdjustSoundParams(mobj_t *listener, mobj_t *source, | |||
521 | fixed_t adx, ady, approx_dist; | 521 | fixed_t adx, ady, approx_dist; |
522 | angle_t angle; | 522 | angle_t angle; |
523 | 523 | ||
524 | if (nosfxparm) | 524 | if (!enable_sound) |
525 | return 0; | 525 | return 0; |
526 | 526 | ||
527 | // calculate the distance to sound origin | 527 | // calculate the distance to sound origin |
@@ -576,7 +576,7 @@ static int S_getChannel(void *origin, sfxinfo_t *sfxinfo, int is_pickup) | |||
576 | int cnum; | 576 | int cnum; |
577 | channel_t* c; | 577 | channel_t* c; |
578 | 578 | ||
579 | if (nosfxparm) | 579 | if (!enable_sound) |
580 | return -1; | 580 | return -1; |
581 | 581 | ||
582 | // Find an open channel | 582 | // Find an open channel |