BLADERUNNER: GPS talkie does not disable controls

2 files changed, 1 insertions, 33 deletions

diff --git a/engines/bladerunner/ui/spinner.cpp b/engines/bladerunner/ui/spinner.cpp
index bb4f67b05b..0054e1b2ef 100644
--- a/engines/bladerunner/ui/spinner.cpp
+++ b/engines/bladerunner/ui/spinner.cpp
@@ -163,8 +163,7 @@ int Spinner::chooseDestination(int loopId, bool immediately) {
 			mouseUpCallback,
 			this
 		);
-//		_vm->_ambientSounds->playSpeech(kActorAnsweringMachine, 480, 50, 0, 0, 100);
-		playSpeechLine(kActorAnsweringMachine, 480, 0.5f);
+		_vm->_actors[kActorAnsweringMachine]->speechPlay(480, false);
 		_vm->_ambientSounds->addSound(kSfxSPINAMB2,  5, 30, 30,  45,    0,   0, -101, -101, 0, 0);
 	} else {
 		_imagePicker->activate(
@@ -440,34 +439,4 @@ void Spinner::tickDescription() {
 	}
 }
 
-void Spinner::playSpeechLine(int actorId, int sentenceId, float duration) {
-	_vm->gameWaitForActive();
-
-	_vm->_mouse->disable();
-	Actor *actor = _vm->_actors[actorId];
-	actor->speechPlay(sentenceId, true);
-
-	while (_vm->_gameIsRunning) {
-		_vm->_actorIsSpeaking = true;
-		_vm->_actorSpeakStopIsRequested = false;
-		_vm->gameTick();
-		_vm->_actorIsSpeaking = false;
-		if (_vm->_actorSpeakStopIsRequested || !actor->isSpeeching()) {
-			actor->speechStop();
-			break;
-		}
-	}
-
-	if (duration > 0.0f && !_vm->_actorSpeakStopIsRequested) {
-		int timeEnd = duration * 1000.0f + _vm->_time->current();
-		while ((timeEnd > _vm->_time->current()) && _vm->_gameIsRunning) {
-			_vm->gameTick();
-		}
-	}
-
-	_vm->_actorSpeakStopIsRequested = false;
-
-	_vm->_mouse->enable();
-}
-
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/ui/spinner.h b/engines/bladerunner/ui/spinner.h
index a637cefdcc..50a8be97b6 100644
--- a/engines/bladerunner/ui/spinner.h
+++ b/engines/bladerunner/ui/spinner.h
@@ -76,7 +76,6 @@ public:
 	void reset();
 	void resume();
 
-	void playSpeechLine(int actorId, int sentenceId, float duration);
 	void destinationFocus(int destination);
 	void setupDescription(int actorId, int sentenceId);
 	void resetDescription();