summaryrefslogtreecommitdiff
path: root/src/doomstat.h
diff options
context:
space:
mode:
authorSimon Howard2006-03-23 17:43:15 +0000
committerSimon Howard2006-03-23 17:43:15 +0000
commitd54a1ab430987fb6bda3c05ee2db2e9d012a6341 (patch)
tree46279b4dc9969641e9e99dc0dcddf58e642cc0c7 /src/doomstat.h
parente920b33fe51d5f129935ae7d8bfc85bf37263e3d (diff)
downloadchocolate-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/doomstat.h')
-rw-r--r--src/doomstat.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doomstat.h b/src/doomstat.h
index b9ea204c..fe850b19 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: doomstat.h 388 2006-02-24 19:14:22Z fraggle $
+// $Id: doomstat.h 429 2006-03-23 17:43:15Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -105,13 +105,12 @@ extern boolean deathmatch;
// but are not (yet) supported with Linux
// (e.g. no sound volume adjustment with menu.
-// These are not used, but should be (menu).
// From m_menu.c:
// Sound FX volume has default, 0 - 15
// Music volume has default, 0 - 15
// These are multiplied by 8.
-extern int snd_SfxVolume; // maximum volume for sound
-extern int snd_MusicVolume; // maximum volume for music
+extern int sfxVolume;
+extern int musicVolume;
// Current music/sfx card - index useless
// w/o a reference LUT in a sound module.