[Scummvm-cvs-logs] scummvm master -> 3e38e6e22158de309914a946e5791ea2b927078b

wjp wjp at usecode.org
Wed Jul 13 22:45:42 CEST 2011


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:
3e38e6e221 SCI: Restore deleted LSL6 workaround for crash on loading


Commit: 3e38e6e22158de309914a946e5791ea2b927078b
    https://github.com/scummvm/scummvm/commit/3e38e6e22158de309914a946e5791ea2b927078b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-07-13T13:43:21-07:00

Commit Message:
SCI: Restore deleted LSL6 workaround for crash on loading

This was probably accidentally removed in
194081e7ae79a632ce446653cc7119b74d3a6fac. The TODO/CHECKME on it still
applies. Reported in bug #3366329.

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



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index e61da20..b2cde47 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -283,6 +283,8 @@ const SciWorkaroundEntry kGraphSaveBox_workarounds[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kGraphRestoreBox_workarounds[] = {
+	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "show",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // happens when restoring, is called with hunk segment, but hunk is not allocated at that time
+	// ^^ TODO: check, if this is really a script error or an issue with our restore code
 	{ GID_LSL6,           -1,    86,  0,             "LL6Inv", "hide",           -1,    0, { WORKAROUND_STILLCALL, 0 } }, // happens during the game, gets called with 1 extra parameter
 	{ GID_SQ5,           850,   850,  0,                 NULL, "changeState",    -1,    0, { WORKAROUND_STILLCALL, 0 } }, // happens while playing Battle Cruiser (invalid segment) - bug #3056811
 	SCI_WORKAROUNDENTRY_TERMINATOR






More information about the Scummvm-git-logs mailing list