aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2010-05-19 16:54:42 +0000
committerNicola Mettifogo2010-05-19 16:54:42 +0000
commitcbee7eebd4736a91400bc3df65d28215cb916aa9 (patch)
tree1dd3d3f2ed553b3c6681e78131244517019467ce /engines
parent480e5c84888c40a54f173c90bc634fa579b83b79 (diff)
downloadscummvm-rg350-cbee7eebd4736a91400bc3df65d28215cb916aa9.tar.gz
scummvm-rg350-cbee7eebd4736a91400bc3df65d28215cb916aa9.tar.bz2
scummvm-rg350-cbee7eebd4736a91400bc3df65d28215cb916aa9.zip
Do not try and run dialogues when there is no dialogue defined in a SPEAK zone. Patch 3003382 by fuzzie.
svn-id: r49103
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/parallaction.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 67d081120e..f31b7abcd2 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -598,8 +598,11 @@ void Parallaction::runZone(ZonePtr z) {
break;
case kZoneSpeak:
- enterDialogueMode(z);
- return;
+ if (z->u._speakDialogue) {
+ enterDialogueMode(z);
+ return;
+ }
+ break;
}
debugC(3, kDebugExec, "runZone completed");