From f3f7489b4959950cf2bbdb753b48cae66f292cea Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 22 Sep 2003 14:55:17 +0000
Subject: Set the mixer to use the maximum volume. BS2 has its own volume
 settings, and we want them to go all the way up to eleven.

svn-id: r10362
---
 sword2/sword2.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 9dad451090..673e815f3f 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -109,8 +109,11 @@ Sword2State::Sword2State(GameDetector *detector, OSystem *syst)
 	if (!_mixer->bindToSystem(syst))
 		warning("Sound initialization failed");
 
-	_mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255);
-	_mixer->setMusicVolume(kDefaultMusicVolume * kDefaultMasterVolume / 255);
+	// We have our own volume settings panel, so don't let ScummVM's mixer
+	// soften the sound in any way.
+
+	_mixer->setVolume(256);
+	_mixer->setMusicVolume(256);
 
 	g_sound = _sound = new Sword2Sound(_mixer);
 	
-- 
cgit v1.2.3