From 90c07db56f1270a4aea2bbbb95d4ad50532ad5f5 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Thu, 2 Aug 2001 12:34:50 +0000
Subject: [PATCH]

---
 source/sound/sound.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp
index 9eb9241d6..fa290d9d3 100644
--- a/source/sound/sound.cpp
+++ b/source/sound/sound.cpp
@@ -356,6 +356,8 @@ void CSoundMediator::initialise()
 		s_targetVolume[i]=INITIAL_VOLUME;
 		s_volumeDirty[i]=true;
 	}
+//	s_targetVolume[VOL_SONG]=INITIAL_VOLUME-32;
+	s_targetVolume[VOL_SPEECH]=INITIAL_VOLUME+64;
 
 	ASSERT(CXAStream::MIN_VOLUME==0);			// Just incase someone decides to change any of these.. things in here will break ( PKG )
 	ASSERT(CXAStream::MAX_VOLUME==32767);
@@ -446,7 +448,7 @@ if(_frames==0)_frames=1;
 	if (isSpeechPlaying())
 	{
 		s_volumeDirty[VOL_SONG]=true;
-		s_currentVolume[VOL_FADE]=128;
+		s_currentVolume[VOL_FADE]=64;
 	}
 	if(s_volumeDirty[VOL_SONG])
 	{
@@ -460,7 +462,12 @@ if(_frames==0)_frames=1;
 	}
 	if(s_volumeDirty[VOL_SPEECH])
 	{
-		int vol=((s_currentVolume[VOL_SPEECH]*s_currentVolume[VOL_FADE])>>8)<<7;
+//		int vol=((s_currentVolume[VOL_SPEECH]*s_currentVolume[VOL_FADE])/*>>8*/)/*<<7*/;
+		int vol=s_currentVolume[VOL_SPEECH]<<8;//*s_currentVolume[VOL_FADE])/*>>8*/)/*<<7*/;
+
+		if (vol<=CXAStream::MIN_VOLUME) vol=CXAStream::MIN_VOLUME;
+		if (vol>=CXAStream::MAX_VOLUME) vol=CXAStream::MAX_VOLUME;
+
 		CXAStream::setMasterVolume(vol,vol);
 		s_volumeDirty[VOL_SPEECH]=false;
 	}