[Scummvm-git-logs] scummvm master -> 2c56ec0aad4eae04ef3147d46ad3f77aee40a65c
sluicebox
22204938+sluicebox at users.noreply.github.com
Thu Nov 26 11:52:24 UTC 2020
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:
a1bead4362 SCI: Fix KQ6 inventory in dark catacombs room
2c56ec0aad SCI: Fix LB1 cursor initialization in room 44
Commit: a1bead436263caef75331f82a5f69e0bd3b4973e
https://github.com/scummvm/scummvm/commit/a1bead436263caef75331f82a5f69e0bd3b4973e
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-11-26T03:49:40-08:00
Commit Message:
SCI: Fix KQ6 inventory in dark catacombs room
Changed paths:
engines/sci/engine/script_patches.cpp
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 96e2c5821e..e53504f789 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -5498,6 +5498,35 @@ static const uint16 kq6PatchRoom407LookMessage[] = {
PATCH_END
};
+// After lighting the torch in the dark catacombs room and then re-entering,
+// using items such as a book results in a message that the room is too dark.
+// rm406:scriptCheck tests for darkness with a local variable that is set when
+// lighting the torch instead of a persistent global. We could change the
+// darkness test but it turns out that this method is never called in the dark.
+// KQ6Room:setScript only calls scriptCheck when ego:view is 900 and that is
+// only true once the torch is lit.
+//
+// We fix this by patching rm406:scriptCheck to always allow items since the
+// condition it tries to prevent can never occur.
+//
+// Applies to: All versions
+// Responsible method: rm406:scriptCheck
+static const uint16 kq6SignatureDarkRoomInventory[] = {
+ 0x3f, 0x01, // link 01
+ 0x35, 0x00, // ldi 00
+ 0xa5, 0x00, // sat temp0
+ 0x8b, SIG_MAGICDWORD, 0x01, // lsl 01
+ 0x35, 0x64, // ldi 64
+ 0x22, // lt? [ has lightItUp not run yet? ]
+ SIG_END
+};
+
+static const uint16 kq6PatchDarkRoomInventory[] = {
+ 0x35, 0x01, // ldi 01
+ 0x48, // ret [ return true, allow items ]
+ PATCH_END
+};
+
// Audio + subtitles support - SHARED! - used for King's Quest 6 and Laura Bow 2.
// This patch gets enabled when the user selects "both" in the ScummVM
// "Speech + Subtitles" menu. We currently use global[98d] to hold a kMemory
@@ -5945,6 +5974,7 @@ static const SciScriptPatcherEntry kq6Signatures[] = {
{ true, 300, "fix floating off steps", 2, kq6SignatureCliffStepFloatFix, kq6PatchCliffStepFloatFix },
{ true, 300, "fix floating off steps", 2, kq6SignatureCliffItemFloatFix, kq6PatchCliffItemFloatFix },
{ true, 405, "fix catacombs room message", 1, kq6SignatureRoom405LookMessage, kq6PatchRoom405LookMessage },
+ { true, 406, "fix catacombs dark room inventory", 1, kq6SignatureDarkRoomInventory, kq6PatchDarkRoomInventory },
{ true, 407, "fix catacombs room message", 1, kq6SignatureRoom407LookMessage, kq6PatchRoom407LookMessage },
{ true, 480, "CD: fix wallflower dance", 1, kq6CDSignatureWallFlowerDanceFix, kq6CDPatchWallFlowerDanceFix },
{ true, 480, "fix getting baby tears", 1, kq6SignatureGetBabyTears, kq6PatchGetBabyTears },
Commit: 2c56ec0aad4eae04ef3147d46ad3f77aee40a65c
https://github.com/scummvm/scummvm/commit/2c56ec0aad4eae04ef3147d46ad3f77aee40a65c
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-11-26T03:49:40-08:00
Commit Message:
SCI: Fix LB1 cursor initialization in room 44
Changed paths:
engines/sci/engine/script_patches.cpp
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index e53504f789..29a68a4063 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -7715,6 +7715,45 @@ static const uint16 laurabow1PatchLillianBedFix[] = {
PATCH_END
};
+// Entering Laura's bedroom resets the cursor position to the upper right corner
+// of the screen as if the game were starting. Room44:init calls kSetCursor to
+// initialize the game because it's the first room where the user has control,
+// but this part of the script is missing the startup test and so it happens
+// every time. We fix this by adding the missing startup test.
+//
+// Applies to: All versions
+// Responsible method: Room44:init
+static const uint16 laurabow1SignatureRoom44CursorFix[] = {
+ SIG_MAGICDWORD,
+ 0x35, 0x00, // ldi 00
+ 0xa1, 0xbe, // sag be [ global190 = 0 ]
+ 0x39, SIG_SELECTOR8(init), // pushi init
+ 0x76, // push0
+ 0x57, 0x37, 0x04, // super Rm 04 [ super init: ]
+ SIG_ADDTOOFFSET(+10),
+ 0x43, 0x28, 0x08, // callk SetCursor 08 [ SetCursor 997 1 300 0 ]
+ SIG_ADDTOOFFSET(+439),
+ 0x89, 0xa5, // lsg a5
+ 0x35, 0x00, // ldi 00
+ 0x1a, // eq?
+ 0x30, // bnt
+ SIG_END
+};
+
+static const uint16 laurabow1PatchRoom44CursorFix[] = {
+ 0x39, PATCH_SELECTOR8(init), // pushi init
+ 0x76, // push0
+ 0x57, 0x37, 0x04, // super Rm 04 [ super init: ]
+ 0x81, 0xcb, // lag cb [ global203 == 0 when game is starting ]
+ 0x2f, 0x0d, // bt 0d [ skip SetCursor if game already started ]
+ PATCH_ADDTOOFFSET(+452),
+ 0x76, // push0
+ 0xa9, 0xbe, // ssg be [ global190 = 0 ]
+ 0x81, 0xa5, // lag a5
+ 0x2e, // bt
+ PATCH_END
+};
+
// When you tell Lilly about Gertie in room 35, Lilly will then walk to the
// left and off the screen. If Laura (ego) is in the way, the whole game will
// basically block and you won't be able to do anything except saving or
@@ -8000,6 +8039,7 @@ static const SciScriptPatcherEntry laurabow1Signatures[] = {
{ true, 37, "armor move to fix", 2, laurabow1SignatureArmorMoveToFix, laurabow1PatchArmorMoveToFix },
{ true, 37, "allowing input, after oiling arm", 1, laurabow1SignatureArmorOilingArmFix, laurabow1PatchArmorOilingArmFix },
{ true, 44, "lillian bed fix", 1, laurabow1SignatureLillianBedFix, laurabow1PatchLillianBedFix },
+ { true, 44, "room 44 cursor fix", 1, laurabow1SignatureRoom44CursorFix, laurabow1PatchRoom44CursorFix },
{ true, 47, "attic stairs lockup fix", 1, laurabow1SignatureAtticStairsLockupFix, laurabow1PatchAtticStairsLockupFix },
{ true, 47, "left stairs lockup fix", 3, laurabow1SignatureLeftStairsLockupFix, laurabow1PatchLeftStairsLockupFix },
{ true, 58, "chapel candles persistence", 1, laurabow1SignatureChapelCandlesPersistence, laurabow1PatchChapelCandlesPersistence },
More information about the Scummvm-git-logs
mailing list