foxygit / doom Log in
commit 623b4b1a2fdb0a974b20f45a8a3d0bc14db13691
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Mar 27 23:42:00 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Mar 27 23:42:00 2011 +0000

    Change default sfx/music volume in setup tool to 8, to match the game
    (thanks Alexandre Xavier).

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2309
---
 NEWS          | 3 +++
 setup/sound.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index d0fee599..003c35a5 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@
      * Default joystick buttons for the setup tool now match Vanilla
        (thanks twipley).
      * Visual Studio project files work again (thanks GhostlyDeath).
+     * The default sfx/music volume set by the setup tool is now 8
+       instead of 15, matching the game itself. (thanks Alexandre
+       Xavier).

     libtextscreen:
      * It is now possible to type a '+' in input boxes (thanks
diff --git a/setup/sound.c b/setup/sound.c
index 59df0532..2352baa1 100644
--- a/setup/sound.c
+++ b/setup/sound.c
@@ -59,10 +59,10 @@ static char *musmode_strings[] =

 int snd_sfxdevice = SNDDEVICE_SB;
 int numChannels = 8;
-int sfxVolume = 15;
+int sfxVolume = 8;

 int snd_musicdevice = SNDDEVICE_GENMIDI;
-int musicVolume = 15;
+int musicVolume = 8;

 int snd_samplerate = 22050;
 int opl_io_port = 0x388;