From c33c1fa07680ef07540fb1c48a323bdc816e3e77 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 6 Feb 2010 15:54:13 +0000
Subject: Fix Heretic/Hexen "noise" sound debug cheats.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1850
---
 src/hexen/s_sound.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/hexen/s_sound.c')

diff --git a/src/hexen/s_sound.c b/src/hexen/s_sound.c
index fdd01ba5..74774fb3 100644
--- a/src/hexen/s_sound.c
+++ b/src/hexen/s_sound.c
@@ -787,8 +787,16 @@ void S_GetChannelInfo(SoundInfo_t * s)
         c->priority = Channel[i].priority;
         c->name = S_sfx[c->id].name;
         c->mo = Channel[i].mo;
-        c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
-            >> FRACBITS;
+
+        if (c->mo != NULL)
+        {
+            c->distance = P_AproxDistance(c->mo->x - viewx, c->mo->y - viewy)
+                >> FRACBITS;
+        }
+        else
+        {
+            c->distance = 0;
+        }
     }
 }
 
-- 
cgit v1.2.3


From af48a6309cf1f03b5136e26a5fc27a38e490d808 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 30 Apr 2010 21:48:34 +0000
Subject: Scale up music volume from configuration file value in Heretic/Hexen.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1925
---
 src/hexen/s_sound.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/hexen/s_sound.c')

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)
     {
-- 
cgit v1.2.3