From 010bdaa1f91fc2c3caaedaa66ea509475928175a Mon Sep 17 00:00:00 2001 From: Daveo Date: Thu, 26 Jul 2001 15:22:34 +0000 Subject: [PATCH] --- source/player/pmdead.cpp | 3 +++ source/sound/sound.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/source/player/pmdead.cpp b/source/player/pmdead.cpp index b44537589..7e8517d0a 100644 --- a/source/player/pmdead.cpp +++ b/source/player/pmdead.cpp @@ -90,6 +90,9 @@ void CPlayerModeDead::enter() m_player->setAnimNo(deathAnim); } + CSoundMediator::stopSpeech(); + + m_killed=false; } diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp index cfb462c4b..9eb9241d6 100644 --- a/source/sound/sound.cpp +++ b/source/sound/sound.cpp @@ -442,6 +442,12 @@ if(_frames==0)_frames=1; s_volumeDirty[VOL_SPEECH]=true; s_volumeDirty[VOL_FADE]=false; } + + if (isSpeechPlaying()) + { + s_volumeDirty[VOL_SONG]=true; + s_currentVolume[VOL_FADE]=128; + } if(s_volumeDirty[VOL_SONG]) { s_xmplaySound->setMasterSongVolume((s_currentVolume[VOL_SONG]*s_currentVolume[VOL_FADE])>>8);