aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock
diff options
context:
space:
mode:
authorPaul Gilbert2015-04-26 04:52:31 -0500
committerPaul Gilbert2015-04-26 04:52:31 -0500
commit250b3c1a30acba5770f214edaf14bc288065acd9 (patch)
tree025d51cfb727f1e6c610d848a24850201e4ddc10 /engines/sherlock
parent0c68c0a53ac2ffb5837ca2eada00af7f371bc7c9 (diff)
downloadscummvm-rg350-250b3c1a30acba5770f214edaf14bc288065acd9.tar.gz
scummvm-rg350-250b3c1a30acba5770f214edaf14bc288065acd9.tar.bz2
scummvm-rg350-250b3c1a30acba5770f214edaf14bc288065acd9.zip
SHERLOCK: Fix handling of talk opcodes in journal loading
Diffstat (limited to 'engines/sherlock')
-rw-r--r--engines/sherlock/journal.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index ffda25a533..255662f71c 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -356,23 +356,23 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
break;
case 134: // Change sequence
- replyP += (replyP[0] & 127) + replyP[2] + 1;
+ replyP += (replyP[0] & 127) + replyP[2] + 2;
break;
case 135: // Walk to co-ords
case 154: // Move mouse
- replyP += 3;
+ replyP += 4;
break;
case 139: // Set flag
case 143: // If statement
- ++replyP;
+ replyP += 2;
break;
case 140: // Play voice file
case 150: // Play prologue
case 153: // Call talk file
- replyP += 7;
+ replyP += 8;
break;
case 141: // Toggle object
@@ -380,11 +380,11 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
case 152: // Set object
case 155: // Info line
case 158: // Delete item from inventory
- replyP += *replyP & 127;
+ replyP += (*replyP & 127) + 1;
break;
case 149: // Goto scene
- replyP += 4;
+ replyP += 5;
break;
case 161: // End of line