aboutsummaryrefslogtreecommitdiff
path: root/engines/toon/toon.cpp
diff options
context:
space:
mode:
authorSylvain Dupont2010-10-16 17:06:10 +0000
committerSylvain Dupont2010-10-16 17:06:10 +0000
commit49fc73e3be33163b63d7a3114bdc27032f5ffdde (patch)
treeb6606a538a28c2e7f3757668b4a14f340621bad0 /engines/toon/toon.cpp
parentde1b17fb99a8351244721f6c595a2ed539f6afc2 (diff)
downloadscummvm-rg350-49fc73e3be33163b63d7a3114bdc27032f5ffdde.tar.gz
scummvm-rg350-49fc73e3be33163b63d7a3114bdc27032f5ffdde.tar.bz2
scummvm-rg350-49fc73e3be33163b63d7a3114bdc27032f5ffdde.zip
TOON: Fix bugs #3085967 and #3085969 about guards dance
Bug #3085969: "TOON: Missing dialogue for Palace guards dance" Bug #3085969: "TOON: Missing dialogue for Palace Guards sequence" svn-id: r53543
Diffstat (limited to 'engines/toon/toon.cpp')
-rw-r--r--engines/toon/toon.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 993bae9c05..dfb25a7777 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -915,6 +915,8 @@ void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) {
addItemToInventory(_gameState->_mouseState);
_gameState->_mouseState = -1;
+ _mouseButton = 0;
+ _lastMouseButton = 0x3;
// load package
@@ -1795,9 +1797,11 @@ void ToonEngine::playTalkAnimOnCharacter(int32 animID, int32 characterId, bool t
int32 ToonEngine::characterTalk(int32 dialogid, bool blocking) {
if (blocking == false && _audioManager->voiceStillPlaying()) {
- // someone is already talking, and this voice is not important
- // skip it
- return 0;
+ if (_currentTextLineCharacterId == 0 || _currentTextLineCharacterId == 1) {
+ // Drew or Flux is already talking, and this voice is not important
+ // skip it
+ return 0;
+ }
}
int32 myId = 0;