diff options
| author | Tony Puccinelli | 2010-08-11 01:11:16 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-11 01:11:16 +0000 |
| commit | 3a7a0ba720f219c4780cf19d196cda9c0456a20b (patch) | |
| tree | fe7f45242447dc7d14447babbdea9fbbb771c506 /engines/parallaction/dialogue.cpp | |
| parent | 6543062e5701e8011a4b12abffa8afca56f30b3f (diff) | |
| parent | fffec23a02cc88ed8daba0a3b50007b7e220c075 (diff) | |
| download | scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.tar.gz scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.tar.bz2 scummvm-rg350-3a7a0ba720f219c4780cf19d196cda9c0456a20b.zip | |
manually merged engines from trunk into branch
svn-id: r51964
Diffstat (limited to 'engines/parallaction/dialogue.cpp')
| -rw-r--r-- | engines/parallaction/dialogue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 6332600226..7a28d18f17 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -461,6 +461,10 @@ public: void Parallaction::enterDialogueMode(ZonePtr z) { + if (!z->u._speakDialogue) { + return; + } + debugC(1, kDebugDialogue, "Parallaction::enterDialogueMode(%s)", z->u._filename.c_str()); _dialogueMan = createDialogueManager(z); assert(_dialogueMan); |