[Scummvm-cvs-logs] scummvm master -> 1f5c3a69678b924c9311c17df344f0a266c6cb6a

[bluegr]

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

Summary:
c2274e9065 SCI: Make sure that planeOffsetX is always correctly initialized
1f5c3a6967 SCI: Extended a workaround for KQ7 to apply in all rooms


Commit: c2274e90653c381d15c912b05472a78c048ac33e
    https://github.com/scummvm/scummvm/commit/c2274e90653c381d15c912b05472a78c048ac33e
Author: md5 (md5 at scummvm.org)
Date: 2011-03-24T22:41:55-07:00

Commit Message:
SCI: Make sure that planeOffsetX is always correctly initialized

Fixes several issues with the menu in KQ7. Thanks to vakons for his patch.
Fixes bug #3231867 - "KQ7 scrolling bug"

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index fbfd140..e68f964 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -123,7 +123,10 @@ void GfxFrameout::kernelUpdatePlane(reg_t object) {
 			if (it->planeRect.left < 0) {
 				it->planeOffsetX = -it->planeRect.left;
 				it->planeRect.left = 0;
+			} else {
+				it->planeOffsetX = 0;
 			}
+
 			if (it->planeRect.top < 0)
 				it->planeRect.top = 0;
 			// We get bad plane-bottom in sq6


Commit: 1f5c3a69678b924c9311c17df344f0a266c6cb6a
    https://github.com/scummvm/scummvm/commit/1f5c3a69678b924c9311c17df344f0a266c6cb6a
Author: md5 (md5 at scummvm.org)
Date: 2011-03-24T22:42:27-07:00

Commit Message:
SCI: Extended a workaround for KQ7 to apply in all rooms

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



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 17c9f9f..bd93f60 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -90,7 +90,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_KQ6,           520,   520,  0,              "rm520", "init",           -1,    0, { WORKAROUND_FAKE,   0 } }, // going to boiling water trap on beast isle
 	{ GID_KQ6,            -1,   903,  0,         "controlWin", "open",           -1,    4, { WORKAROUND_FAKE,   0 } }, // when opening the controls window (save, load etc)
 	{ GID_KQ6,            -1,   907,  0,             "tomato", "doVerb",         -1,    2, { WORKAROUND_FAKE,   0 } }, // when looking at the rotten tomato in the inventory - bug #3059544
-	{ GID_KQ7,            30, 64996,  0,               "User", "handleEvent",    -1,    1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
+	{ GID_KQ7,            -1, 64996,  0,               "User", "handleEvent",    -1,    1, { WORKAROUND_FAKE,   0 } }, // called when pushing a keyboard key
 	{ GID_LAURABOW,       37,     0,  0,                "CB1", "doit",           -1,    1, { WORKAROUND_FAKE,   0 } }, // when going up the stairs (bug #3037694)
 	{ GID_LAURABOW,       -1,   967,  0,             "myIcon", "cycle",          -1,    1, { WORKAROUND_FAKE,   0 } }, // having any portrait conversation coming up (initial bug #3034985)
 	{ GID_LAURABOW2,      -1,    24,  0,              "gcWin", "open",           -1,    5, { WORKAROUND_FAKE, 0xf } }, // is used as priority for game menu