From ab79d581531355f76f90ce0668e012ffbfa201f5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 7 Aug 2010 01:09:32 +0000
Subject: SCI: Fixed script bug #3040142 - "PEPPER: Crash on Pugh's office"

svn-id: r51821
---
 engines/sci/engine/vm.cpp          | 2 +-
 engines/sci/engine/workarounds.cpp | 6 ++++++
 engines/sci/engine/workarounds.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index dbf9c2b17e..fe4eb15763 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -1248,7 +1248,7 @@ void run_vm(EngineState *s) {
 				if (validate_signedInteger(r_temp, compare1) && validate_signedInteger(s->r_acc, compare2))
 					s->r_acc = make_reg(0, compare1 <= compare2);
 				else
-					s->r_acc = arithmetic_lookForWorkaround(opcode, NULL, r_temp, s->r_acc);
+					s->r_acc = arithmetic_lookForWorkaround(opcode, opcodeLeWorkarounds, r_temp, s->r_acc);
 			}
 			break;
 
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 4c6ddc18df..b7bb306edf 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -52,6 +52,12 @@ const SciWorkaroundEntry opcodeGeWorkarounds[] = {
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
+//    gameID,           room,script,lvl,          object-name, method-name,    call,index,             workaround
+const SciWorkaroundEntry opcodeLeWorkarounds[] = {
+	{ GID_PEPPER,         370,   23,  0,    "eastExitFeature", "onMe",           -1,    0, { WORKAROUND_FAKE,   1 } }, // Pugh's office, when trying to use either the left or right exits, gets called on an integer and a pointer - bug #3040142
+	SCI_WORKAROUNDENTRY_TERMINATOR
+};
+
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,             workaround
 const SciWorkaroundEntry opcodeLsiWorkarounds[] = {
 	{ GID_QFG2,           200,  200,  0,              "astro", "messages",       -1,    0, { WORKAROUND_FAKE,   0 } }, // when getting asked for your name by the astrologer bug #3039879
diff --git a/engines/sci/engine/workarounds.h b/engines/sci/engine/workarounds.h
index 1b3bafd6cc..220ffd7fda 100644
--- a/engines/sci/engine/workarounds.h
+++ b/engines/sci/engine/workarounds.h
@@ -71,6 +71,7 @@ struct SciWorkaroundEntry {
 extern const SciWorkaroundEntry opcodeDivWorkarounds[];
 extern const SciWorkaroundEntry opcodeDptoaWorkarounds[];
 extern const SciWorkaroundEntry opcodeGeWorkarounds[];
+extern const SciWorkaroundEntry opcodeLeWorkarounds[];
 extern const SciWorkaroundEntry opcodeLsiWorkarounds[];
 extern const SciWorkaroundEntry opcodeMulWorkarounds[];
 extern const SciWorkaroundEntry opcodeAndWorkarounds[];
-- 
cgit v1.2.3