Dubbing is played.

I haven't implemented switching dubbing and subtitles on/off according to
the config manager nor the speed of the subtitles, yet.

svn-id: r45001

1 files changed, 3 insertions, 9 deletions

diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index ff15483cc7..a9cf42c73b 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -414,18 +414,11 @@ void Game::loop() {
 
 		// Handle character talking (if there is any)
 		if (_loopSubstatus == kSubstatusTalk) {
-			Animation *speechAnim = _vm->_anims->getAnimation(kSpeechText);
-			Text *speechFrame = reinterpret_cast<Text *>(speechAnim->getFrame());
-
-			uint speechDuration = kBaseSpeechDuration +
-			                      speechFrame->getLength() * kSpeechTimeUnit /
-			                      (128 / 16 + 1);
-
 			// If the current speech text has expired or the user clicked a mouse button,
 			// advance to the next line of text
 			if (_vm->_mouse->lButtonPressed() ||
 				_vm->_mouse->rButtonPressed() ||
-				(_vm->_system->getMillis() - _speechTick) >= speechDuration) {
+				(_vm->_system->getMillis() - _speechTick) >= _speechDuration) {
 
 				_shouldExitLoop = true;
 				_vm->_mouse->lButtonSet(false);
@@ -1508,8 +1501,9 @@ const Person *Game::getPerson(int personID) const {
 	return &_persons[personID];
 }
 
-void Game::setSpeechTick(uint tick) {
+void Game::setSpeechTiming(uint tick, uint duration) {
 	_speechTick = tick;
+	_speechDuration = duration;
 }
 
 int Game::getEscRoom() const {