[Scummvm-cvs-logs] scummvm master -> ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b

[fuzzie]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ff1828fc71 MOHAWK: Play anims for LiveText items *after* the speech.


Commit: ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b
    https://github.com/scummvm/scummvm/commit/ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-07-08T11:26:02-07:00

Commit Message:
MOHAWK: Play anims for LiveText items *after* the speech.

Another attempt at fixing bug #3541294.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index f5e5e7d..7f7df66 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -3460,6 +3460,12 @@ void LBLiveTextItem::update() {
 		uint16 soundId = _words[_currentWord].soundId;
 		if (soundId && !_vm->_sound->isPlaying(soundId)) {
 			paletteUpdate(_currentWord, false);
+
+			// TODO: check this in RE
+			LBItem *item = _vm->getItemById(_words[_currentWord].itemId);
+			if (item)
+				item->togglePlaying(false);
+
 			_currentWord = 0xFFFF;
 		}
 	}
@@ -3530,11 +3536,6 @@ void LBLiveTextItem::handleMouseDown(Common::Point pos) {
 			_currentWord = i;
 			_vm->playSound(this, soundId);
 			paletteUpdate(_currentWord, true);
-
-			// TODO: check this in RE
-			LBItem *item = _vm->getItemById(_words[i].itemId);
-			if (item)
-				item->togglePlaying(false);
 			return;
 		}
 	}