From 0143a5d938fc314d19f2ddcac2192a49a790cb6a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 23 Jan 2013 21:30:47 +0200
Subject: SCI: Bugfix for commit 0968acc: only filter out missing messages for
 the jar

This is to properly fix bug #3601090 without removing any functionality.
The additional check ensures that the look and hand icons work with the
jar. Many thanks to lskovlun for debugging this and providing a fix
---
 engines/sci/engine/kstring.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/sci')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 3838c68502..a6ef5be787 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -540,7 +540,8 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
 	// NOTE: To fix a corrupted jar object, type "send Glass_Jar message 52"
 	// in the debugger.
 	if (g_sci->getGameId() == GID_PEPPER && func == 0 && argc >= 6 && module == 894 &&
-		tuple.noun == 26 && tuple.cond == 0 && tuple.seq == 1)
+		tuple.noun == 26 && tuple.cond == 0 && tuple.seq == 1 && 
+		!s->_msgState->getMessage(module, tuple, NULL_REG))
 		tuple.verb = 0;
 
 	switch (func) {
-- 
cgit v1.2.3