diff --git a/src/s_sound.c b/src/s_sound.c index 1c1dc08ff..514716733 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -449,8 +449,6 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) if (sfx_id == sfx_None) return; - initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume); - for (i = 0; i <= splitscreen; i++) { player_t *player = &players[displayplayers[i]]; @@ -471,11 +469,6 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) { itsUs = true; } - } - - for (i = 0; i <= splitscreen; i++) - { - player_t *player = &players[displayplayers[i]]; if (camera[i].chase && !player->awayviewtics) { @@ -514,6 +507,8 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) sfx = &S_sfx[sfx_id]; } + initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume); + // Initialize sound parameters pitch = NORM_PITCH; priority = NORM_PRIORITY; @@ -688,12 +683,12 @@ void S_UpdateSounds(void) // Update sound/music volumes, if changed manually at console if (actualsfxvolume != cv_soundvolume.value) - S_SetSfxVolume (cv_soundvolume.value); + S_SetSfxVolume(cv_soundvolume.value); if (actualdigmusicvolume != cv_digmusicvolume.value) - S_SetDigMusicVolume (cv_digmusicvolume.value); + S_SetDigMusicVolume(cv_digmusicvolume.value); #ifndef NO_MIDI if (actualmidimusicvolume != cv_midimusicvolume.value) - S_SetMIDIMusicVolume (cv_midimusicvolume.value); + S_SetMIDIMusicVolume(cv_midimusicvolume.value); #endif memset(listener, 0, sizeof(listener)); @@ -727,15 +722,6 @@ void S_UpdateSounds(void) { listenmobj[i] = player->mo; } - } - -#ifndef NOMUMBLE - I_UpdateMumble(players[consoleplayer].mo, listener[0]); -#endif - - for (i = 0; i <= splitscreen; i++) - { - player_t *player = &players[displayplayers[i]]; if (camera[i].chase && !player->awayviewtics) { @@ -753,6 +739,10 @@ void S_UpdateSounds(void) } } +#ifndef NOMUMBLE + I_UpdateMumble(players[consoleplayer].mo, listener[0]); +#endif + for (cnum = 0; cnum < numofchannels; cnum++) { c = &channels[cnum];