diff options
| author | Simon Howard | 2006-03-23 17:43:15 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-03-23 17:43:15 +0000 |
| commit | d54a1ab430987fb6bda3c05ee2db2e9d012a6341 (patch) | |
| tree | 46279b4dc9969641e9e99dc0dcddf58e642cc0c7 /src/s_sound.c | |
| parent | e920b33fe51d5f129935ae7d8bfc85bf37263e3d (diff) | |
| download | chocolate-doom-d54a1ab430987fb6bda3c05ee2db2e9d012a6341.tar.gz chocolate-doom-d54a1ab430987fb6bda3c05ee2db2e9d012a6341.tar.bz2 chocolate-doom-d54a1ab430987fb6bda3c05ee2db2e9d012a6341.zip | |
Separate variables for config file volume levels and sound API internal
volume levels (this is how the Vanilla code behaves).
Fixes sound behavior on level 8!
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 429
Diffstat (limited to 'src/s_sound.c')
| -rw-r--r-- | src/s_sound.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/s_sound.c b/src/s_sound.c index eba7c84e..d8547dc3 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: s_sound.c 318 2006-01-22 21:20:20Z fraggle $ +// $Id: s_sound.c 429 2006-03-23 17:43:15Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -67,7 +67,7 @@ static const char -rcsid[] = "$Id: s_sound.c 318 2006-01-22 21:20:20Z fraggle $"; +rcsid[] = "$Id: s_sound.c 429 2006-03-23 17:43:15Z fraggle $"; @@ -153,14 +153,15 @@ typedef struct // the set of channels available static channel_t* channels; -// These are not used, but should be (menu). // Maximum volume of a sound effect. // Internal default is max out of 0-15. -int snd_SfxVolume = 8; +int sfxVolume = 8; -// Maximum volume of music. Useless so far. -int snd_MusicVolume = 8; +// Maximum volume of music. +int musicVolume = 8; +// Internal volume level, ranging from 0-127 +static int snd_SfxVolume; // whether songs are mus_paused @@ -654,7 +655,6 @@ void S_SetMusicVolume(int volume) I_SetMusicVolume(127); I_SetMusicVolume(volume); - snd_MusicVolume = volume; } |