diff options
| author | Simon Howard | 2010-04-30 21:48:34 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-04-30 21:48:34 +0000 |
| commit | af48a6309cf1f03b5136e26a5fc27a38e490d808 (patch) | |
| tree | 71fd24e7cb697a06c323cfcd770ca9796b30bd45 | |
| parent | 1162b2c65c5bcff51e2d13aa2cfc2051529cfe68 (diff) | |
| download | chocolate-doom-af48a6309cf1f03b5136e26a5fc27a38e490d808.tar.gz chocolate-doom-af48a6309cf1f03b5136e26a5fc27a38e490d808.tar.bz2 chocolate-doom-af48a6309cf1f03b5136e26a5fc27a38e490d808.zip | |
Scale up music volume from configuration file value in Heretic/Hexen.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1925
| -rw-r--r-- | src/heretic/s_sound.c | 4 | ||||
| -rw-r--r-- | src/hexen/s_sound.c | 4 | ||||
| -rw-r--r-- | src/i_sound.c | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/heretic/s_sound.c b/src/heretic/s_sound.c index 8e0be9f1..73942201 100644 --- a/src/heretic/s_sound.c +++ b/src/heretic/s_sound.c @@ -528,7 +528,7 @@ void S_Init(void) { snd_Channels = 8; } - I_SetMusicVolume(snd_MusicVolume); + I_SetMusicVolume(snd_MusicVolume * 8); S_SetMaxVolume(true); I_AtExit(S_ShutDown, true); @@ -586,7 +586,7 @@ void S_SetMaxVolume(boolean fullprocess) static boolean musicPaused; void S_SetMusicVolume(void) { - I_SetMusicVolume(snd_MusicVolume); + I_SetMusicVolume(snd_MusicVolume * 8); if (snd_MusicVolume == 0) { I_PauseSong(); diff --git a/src/hexen/s_sound.c b/src/hexen/s_sound.c index 74774fb3..f11e4ee9 100644 --- a/src/hexen/s_sound.c +++ b/src/hexen/s_sound.c @@ -736,7 +736,7 @@ void S_Init(void) { snd_Channels = 8; } - I_SetMusicVolume(snd_MusicVolume); + I_SetMusicVolume(snd_MusicVolume * 8); I_AtExit(S_ShutDown, true); @@ -837,7 +837,7 @@ void S_SetMusicVolume(void) } else { - I_SetMusicVolume(snd_MusicVolume); + I_SetMusicVolume(snd_MusicVolume * 8); } if (snd_MusicVolume == 0) { diff --git a/src/i_sound.c b/src/i_sound.c index 75f82702..cf9e17a3 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -247,7 +247,6 @@ void I_UpdateSound(void) static void CheckVolumeSeparation(int *sep, int *vol) { -return; if (*sep < 0) { *sep = 0; |