From 90c196e4eb1d079fa946e764ed72a9ecd2c86dac Mon Sep 17 00:00:00 2001
From: James Haley
Date: Sat, 11 Sep 2010 21:12:06 +0000
Subject: Added code (some possibly temporary?) to load voices.wad. Fixed
 several problems with playing of voice sounds - especially had to add a
 dynamic hashtable of voice sfxinfo_t's because Choco won't tolerate
 overwriting them once they've been used (see channel_playing array in
 i_sdlsound.c) - PROBLEM: Random Z_Malloc failures when trying to play sounds.
 Cannot catch in debugger so far.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2065
---
 src/strife/s_sound.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/strife/s_sound.h')

diff --git a/src/strife/s_sound.h b/src/strife/s_sound.h
index 1cb70fa0..5e763014 100644
--- a/src/strife/s_sound.h
+++ b/src/strife/s_sound.h
@@ -37,7 +37,7 @@
 //  allocates channel buffer, sets S_sfx lookup.
 //
 
-void S_Init(int sfxVolume, int musicVolume);
+void S_Init(int sfxVolume, int musicVolume, int voiceVolume);
 
 
 // Shut down sound 
@@ -97,5 +97,7 @@ void S_SetVoiceVolume(int volume); // haleyjd 09/11/10: [STRIFE]
 
 extern int snd_channels;
 
+extern int disable_voices;
+
 #endif
 
-- 
cgit v1.2.3