aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-28 20:09:54 +0000
committerJohannes Schickel2008-04-28 20:09:54 +0000
commit37fb65ea3c38f131ca9e27ceacce0fc72bd0af3e (patch)
tree5ff7609197dbb4e986e6a9bfaa94d5a43e802c03
parent7577e7548c50fac70090078266091caa2f1e0f4b (diff)
downloadscummvm-rg350-37fb65ea3c38f131ca9e27ceacce0fc72bd0af3e.tar.gz
scummvm-rg350-37fb65ea3c38f131ca9e27ceacce0fc72bd0af3e.tar.bz2
scummvm-rg350-37fb65ea3c38f131ca9e27ceacce0fc72bd0af3e.zip
Fixed bug in KyraEngine_v3::processDialog, should fix crash when talking to Bill in hell.
svn-id: r31764
-rw-r--r--engines/kyra/text_v3.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/text_v3.cpp b/engines/kyra/text_v3.cpp
index 2aa05a6359..ef931adb2b 100644
--- a/engines/kyra/text_v3.cpp
+++ b/engines/kyra/text_v3.cpp
@@ -586,10 +586,10 @@ void KyraEngine_v3::processDialog(int vocHighIndex, int vocHighBase, int funcNum
if (script >= 0) {
dialogEndScript(script);
script = -1;
- } else {
- dialogStartScript(object, funcNum);
- script = object;
}
+
+ dialogStartScript(object, funcNum);
+ script = object;
}
npcChatSequence(_stringBuffer, object, vocHigh, vocLow);