Merge branch 'master'

1 files changed, 17 insertions, 15 deletions

diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 413a631118..112f6fd06c 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -26,6 +26,7 @@
 
 #include "common/config-manager.h"
 #include "common/textconsole.h"
+#include "common/substream.h"
 
 #include "backends/audiocd/audiocd.h"
 
@@ -78,6 +79,8 @@ void DrasculaEngine::volumeControls() {
 			;
 
 		if (rightMouseButton == 1) {
+			// Clear this to avoid going straight to the inventory
+			rightMouseButton = 0;
 			delay(100);
 			break;
 		}
@@ -163,29 +166,28 @@ void DrasculaEngine::MusicFadeout() {
 void DrasculaEngine::playFile(const char *fname) {
 	Common::SeekableReadStream *stream = _archives.open(fname);
 	if (stream) {
-		int soundSize = stream->size();
-		byte *soundData = (byte *)malloc(soundSize);
+		int startOffset = 0;
+		int soundSize = stream->size() - startOffset;
 
-		if (!(!strcmp(fname, "3.als") && soundSize == 145166 && _lang != kSpanish)) {
-			stream->seek(32);
-		} else {
+		if (!strcmp(fname, "3.als") && soundSize == 145166 && _lang != kSpanish) {
 			// WORKAROUND: File 3.als with English speech files has a big silence at
 			// its beginning and end. We seek past the silence at the beginning,
 			// and ignore the silence at the end
 			// Fixes bug #2111815 - "DRASCULA: Voice delayed"
-			stream->seek(73959, SEEK_SET);
-			soundSize = 117158 - 73959;
+			startOffset = 73959;
+			soundSize = soundSize - startOffset - 26306;
 		}
 
-		stream->read(soundData, soundSize);
-		delete stream;
-
-		_subtitlesDisabled = !ConfMan.getBool("subtitles");
-		if (ConfMan.getBool("speech_mute"))
-			memset(soundData, 0x80, soundSize); // Mute speech but keep the pause
+		Common::SeekableReadStream *subStream = new Common::SeekableSubReadStream(
+		    stream, startOffset, startOffset + soundSize, DisposeAfterUse::YES);
+		if (!subStream) {
+			warning("playFile: Out of memory");
+			delete stream;
+			return;
+		}
 
-		Audio::AudioStream *sound = Audio::makeRawStream(soundData, soundSize - 64,
-						11025, Audio::FLAG_UNSIGNED);
+		Audio::AudioStream *sound = Audio::makeRawStream(subStream, 11025,
+		                                                 Audio::FLAG_UNSIGNED);
 		_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, sound);
 	} else
 		warning("playFile: Could not open %s", fname);