[Scummvm-git-logs] scummvm master -> 8351303e681e936ae617d9fb87812874dd5d513d

[sluicebox]

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:
1cdb35d601 SCI: Fix script patch comment
8351303e68 SCI: Fix another KQ6 cliff floating script bug


Commit: 1cdb35d6018513a62dabc0e33fbc25c0eb437d30
    https://github.com/scummvm/scummvm/commit/1cdb35d6018513a62dabc0e33fbc25c0eb437d30
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-14T00:40:53-07:00

Commit Message:
SCI: Fix script patch comment

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 2e46498420..eabb2491da 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -4318,7 +4318,7 @@ static const uint16 kq4SignatureFallDownStairs[] = {
 	SIG_ADDTOOFFSET(+0x0108),
 	0x38, SIG_SELECTOR16(new),       // pushi new
 	0x76,                            // push0
-	0x51, 0x31,                      // push Sound
+	0x51, 0x31,                      // class Sound
 	0x4a, 0x04,                      // send 04  [ Sound new: ]
 	0x4a, 0x10,                      // send 10  [ sound number: 51 loop: 1 play: ]
 	0x32, SIG_UINT16(0x0040),        // jmp 0040 [ end of method ]


Commit: 8351303e681e936ae617d9fb87812874dd5d513d
    https://github.com/scummvm/scummvm/commit/8351303e681e936ae617d9fb87812874dd5d513d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-14T00:40:53-07:00

Commit Message:
SCI: Fix another KQ6 cliff floating script bug

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 eabb2491da..6dd64e7f21 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -4931,6 +4931,28 @@ static const uint16 kq6PatchCliffStepFloatFix[] = {
 	PATCH_END
 };
 
+// Similar to the patched bug above, clicking an item on the beach in room 300
+//  while wobbling on the bottom step causes Alexander to float around the room.
+//  The doVerb methods for the flower and the feather incorrectly test ego:y
+//  using a less than comparison instead of less than or equals to, which is
+//  what the rest of the methods in this script do.
+//
+// Applies to: All versions
+// Responsible methods: stench:doVerb, feather:doVerb
+static const uint16 kq6SignatureCliffItemFloatFix[] = {
+	SIG_MAGICDWORD,
+	0x36,                               // push
+	0x35, 0x69,                         // ldi 69
+	0x22,                               // lt?
+	SIG_END
+};
+
+static const uint16 kq6PatchCliffItemFloatFix[] = {
+	PATCH_ADDTOOFFSET(+3),
+	0x24,                               // le?
+	PATCH_END
+};
+
 // After casting the Make Rain spell, collecting the baby's tears a second time
 //  awards a duplicate point. The script getBabyTears is missing a flag check to
 //  prevent this. The falling water from Beast's fountain doesn't have this bug
@@ -5711,6 +5733,7 @@ static const SciScriptPatcherEntry kq6Signatures[] = {
 	{ false,    87, "Mac: Drink Me pic",                              1, kq6SignatureMacDrinkMePic,                kq6PatchMacDrinkMePic },
 	{  true,   281, "fix pawnshop genie eye",                         1, kq6SignaturePawnshopGenieEye,             kq6PatchPawnshopGenieEye },
 	{  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,   407, "fix catacombs room message",                     1, kq6SignatureRoom407LookMessage,           kq6PatchRoom407LookMessage },
 	{  true,   480, "CD: fix wallflower dance",                       1, kq6CDSignatureWallFlowerDanceFix,         kq6CDPatchWallFlowerDanceFix },