ACCESS: Wait for keypress in speakText if voice is turned off

3 files changed, 8 insertions, 1 deletions

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 5636654d03..28847370a2 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -274,7 +274,12 @@ void AccessEngine::speakText(ASurface *s, Common::Array<Common::String> msgArr)
 	if (soundsLeft == 0)
 		return;
 
-	while(true) {
+	if (!_sound->_isVoice) {
+		_events->waitKeyMouse();
+		return;
+	}
+
+	for (;;) {
 		_sound->_soundTable[0] = _sound->loadSound(_narateFile + 99, _sndSubFile);
 		_sound->_soundPriority[0] = 1;
 		_sound->playSound(0);
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 001d2f325b..90818ed5d3 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -32,6 +32,7 @@ SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 	_music = nullptr;
 	_musicRepeat = false;
 	_playingSound = false;
+	_isVoice = false;
 }
 
 SoundManager::~SoundManager() {
diff --git a/engines/access/sound.h b/engines/access/sound.h
index 3d967c6af4..cc02229b3b 100644
--- a/engines/access/sound.h
+++ b/engines/access/sound.h
@@ -48,6 +48,7 @@ public:
 	Resource *_music;
 	bool _musicRepeat;
 	bool _playingSound;
+	bool _isVoice;
 public:
 	SoundManager(AccessEngine *vm, Audio::Mixer *mixer);
 	~SoundManager();