aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2012-07-08 20:24:33 +0200
committerAlyssa Milburn2012-07-08 20:26:02 +0200
commitff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b (patch)
treec43e5d56cb58d41496e2c7568456d125b4274cd6
parent3b69816a7d02f5c6ef03efd48062abd532cced18 (diff)
downloadscummvm-rg350-ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b.tar.gz
scummvm-rg350-ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b.tar.bz2
scummvm-rg350-ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b.zip
MOHAWK: Play anims for LiveText items *after* the speech.
Another attempt at fixing bug #3541294.
-rw-r--r--engines/mohawk/livingbooks.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index f5e5e7d7b4..7f7df66e53 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;
}
}