commit 8ed2da84d97835024d2f561512c418152077139f
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Sep 11 20:53:17 2005 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Sep 11 20:53:17 2005 +0000
Fix sounds playing at the wrong volume (too quiet)
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 101
---
NEWS | 1 +
src/i_sound.c | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index c0db06b0..6c7b5e08 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
+ Fix sound not playing at the right volume
Allow alt-tab away while running in fullscreen under Windows
Add second configuration file (chocolate-doom.cfg) to allow
chocolate-doom specific settings.
diff --git a/src/i_sound.c b/src/i_sound.c
index 87c9bd8b..6939e188 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: i_sound.c 87 2005-09-07 22:24:26Z fraggle $
+// $Id: i_sound.c 101 2005-09-11 20:53:17Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.18 2005/09/11 20:53:17 fraggle
+// Fix sounds playing at the wrong volume (too quiet)
+//
// Revision 1.17 2005/09/07 22:24:26 fraggle
// Modify the sound effect caching behaviour: sounds which are not playing
// are now marked as PU_CACHE; it is otherwise possible to run out of memory.
@@ -87,7 +90,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: i_sound.c 87 2005-09-07 22:24:26Z fraggle $";
+rcsid[] = "$Id: i_sound.c 101 2005-09-11 20:53:17Z fraggle $";
#include <stdio.h>
#include <stdlib.h>
@@ -212,7 +215,7 @@ static void CacheSFX(int sound)
sound_chunks[sound].alen = expanded_length;
sound_chunks[sound].abuf
= Z_Malloc(expanded_length, PU_STATIC, &sound_chunks[sound].abuf);
- sound_chunks[sound].volume = 64;
+ sound_chunks[sound].volume = MIX_MAX_VOLUME;
ExpandSoundData(data + 8, samplerate, length, &sound_chunks[sound]);
@@ -395,7 +398,7 @@ I_SubmitSound(void)
-void
+void
I_UpdateSoundParams
( int handle,
int vol,