shithub: choc

Download patch

ref: af48a6309cf1f03b5136e26a5fc27a38e490d808
parent: 1162b2c65c5bcff51e2d13aa2cfc2051529cfe68
author: Simon Howard <fraggle@gmail.com>
date: Fri Apr 30 17:48:34 EDT 2010 

Scale up music volume from configuration file value in Heretic/Hexen.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1925


--- a/src/heretic/s_sound.c
+++ b/src/heretic/s_sound.c
@@ -528,7 +528,7 @@
     {
         snd_Channels = 8;
     }
-    I_SetMusicVolume(snd_MusicVolume);
+    I_SetMusicVolume(snd_MusicVolume * 8);
     S_SetMaxVolume(true);
 
     I_AtExit(S_ShutDown, true);
@@ -586,7 +586,7 @@
 static boolean musicPaused;
 void S_SetMusicVolume(void)
 {
-    I_SetMusicVolume(snd_MusicVolume);
+    I_SetMusicVolume(snd_MusicVolume * 8);
     if (snd_MusicVolume == 0)
     {
         I_PauseSong();
--- a/src/hexen/s_sound.c
+++ b/src/hexen/s_sound.c
@@ -736,7 +736,7 @@
     {
         snd_Channels = 8;
     }
-    I_SetMusicVolume(snd_MusicVolume);
+    I_SetMusicVolume(snd_MusicVolume * 8);
 
     I_AtExit(S_ShutDown, true);
 
@@ -837,7 +837,7 @@
     }
     else
     {
-        I_SetMusicVolume(snd_MusicVolume);
+        I_SetMusicVolume(snd_MusicVolume * 8);
     }
     if (snd_MusicVolume == 0)
     {
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -247,7 +247,6 @@
 
 static void CheckVolumeSeparation(int *sep, int *vol)
 {
-return;
     if (*sep < 0)
     {
         *sep = 0;