[Scummvm-cvs-logs] scummvm master -> 0143a5d938fc314d19f2ddcac2192a49a790cb6a

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0143a5d938 SCI: Bugfix for commit 0968acc: only filter out missing messages for the jar


Commit: 0143a5d938fc314d19f2ddcac2192a49a790cb6a
    https://github.com/scummvm/scummvm/commit/0143a5d938fc314d19f2ddcac2192a49a790cb6a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-01-23T11:31:26-08:00

Commit Message:
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

Changed paths:
    engines/sci/engine/kstring.cpp



diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 3838c68..a6ef5be 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) {