[Scummvm-git-logs] scummvm master -> d1cf428decc22687b9321a01bcb8b4cd29360aff
sluicebox
noreply at scummvm.org
Fri Aug 19 11:12:51 UTC 2022
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
12576e29fb SCI: Add name filtering to functions debug command
db7699c65a SCI: Set correct SCI1.1 fade-complete signal value
987354c5fa SCI: Fix kDoSoundFade SCI1+ behavior when sound not playing
9ccadff907 SCI: Fix LB2 museum music script bugs
78a6a93faf SCI: Fix LB2 error when clicking dagger case
d1cf428dec SCI: Fix LB2 CD Wolf and O'Riley actor loops
Commit: 12576e29fb13723e05995db9186e7704b1e242b2
https://github.com/scummvm/scummvm/commit/12576e29fb13723e05995db9186e7704b1e242b2
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:27-04:00
Commit Message:
SCI: Add name filtering to functions debug command
Changed paths:
engines/sci/console.cpp
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 0b1c05a3940..dee07f95154 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -621,9 +621,18 @@ bool Console::cmdKernelFunctions(int argc, const char **argv) {
const Common::String &kernelName = _engine->getKernel()->getKernelName(seeker);
if (kernelName == "Dummy")
continue;
- debugPrintf("%03x: %20s | ", seeker, kernelName.c_str());
- if ((column++ % 3) == 2)
- debugPrintf("\n");
+
+ if (argc == 1) {
+ debugPrintf("%03x: %20s | ", seeker, kernelName.c_str());
+ if ((column++ % 3) == 2)
+ debugPrintf("\n");
+ } else {
+ for (int i = 1; i < argc; ++i) {
+ if (kernelName.equalsIgnoreCase(argv[i])) {
+ debugPrintf("%03x: %s\n", seeker, kernelName.c_str());
+ }
+ }
+ }
}
debugPrintf("\n");
Commit: db7699c65aab61a8f23aeecd405f4444c0b654e5
https://github.com/scummvm/scummvm/commit/db7699c65aab61a8f23aeecd405f4444c0b654e5
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:27-04:00
Commit Message:
SCI: Set correct SCI1.1 fade-complete signal value
As the comment says, the signal value is 0x00fe.
Verified in LB2 CD interpreter.
Changed paths:
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e1edbac3f37..ea30ed0b37a 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -632,7 +632,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
// fireworks).
// It is also needed in other games, e.g. LSL6 when talking to the
// receptionist (bug #5601).
- // TODO: More thorougly check the different SCI version:
+ // TODO: More thoroughly check the different SCI version:
// * SCI1late sets signal to 0xFE here. (With signal 0xFF
// duplicate music plays in LauraBow2CD - bug #6462)
// SCI1middle LSL1 1.000.510 does not have the 0xFE;
@@ -641,7 +641,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
// * Need to check SCI0 behaviour.
uint16 sig;
if (getSciVersion() >= SCI_VERSION_1_LATE)
- sig = 0xFFFE;
+ sig = 0x00fe;
else
sig = SIGNAL_OFFSET;
writeSelectorValue(_segMan, obj, SELECTOR(signal), sig);
Commit: 987354c5fac9f35fd6cde2bfc2347b21fc92d74b
https://github.com/scummvm/scummvm/commit/987354c5fac9f35fd6cde2bfc2347b21fc92d74b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:28-04:00
Commit Message:
SCI: Fix kDoSoundFade SCI1+ behavior when sound not playing
In SCI1 and later, kDoSoundFade does not test a sound's status.
Incoming fade properties are applied regardless of whether the
sound is playing and kDoSoundFade does not set the signal.
The code that's been doing this was added and updated in 2010
for ICEMAN and LSL3. Now it's only applied to SCI0 calls.
e41874c91d4e658289664e7ea5eddc2c89a03c34
f743468ec7174088dffde0fd1a61d3afcf78280b
Verified in QFG2 1.000, JONES CD, and LB2 CD.
Fixes scenes in LB2 where multiple songs occasionally play at the
same time due to broken fade-outs. Hiding behind the tapestry
during a meeting is the one that occurred the most consistently.
Related to bug #6462
Changed paths:
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index ea30ed0b37a..4640b334ce2 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -463,15 +463,15 @@ reg_t SoundCommandParser::kDoSoundFade(EngineState *s, int argc, reg_t *argv) {
}
#endif
- // If sound is not playing currently, set signal directly
- if (musicSlot->status != kSoundPlaying) {
- debugC(kDebugLevelSound, "kDoSound(fade): %04x:%04x fading requested, but sound is currently not playing", PRINT_REG(obj));
- writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
- return s->r_acc;
- }
-
switch (argc) {
case 1: // SCI0
+ // If sound is not playing currently, set signal directly
+ if (musicSlot->status != kSoundPlaying) {
+ debugC(kDebugLevelSound, "kDoSound(fade): %04x:%04x fading requested, but sound is currently not playing", PRINT_REG(obj));
+ writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
+ return s->r_acc;
+ }
+
// SCI0 fades out all the time and when fadeout is done it will also
// stop the music from playing
musicSlot->fadeTo = 0;
Commit: 9ccadff907647e1a6181ec679b1589901a9f9cf7
https://github.com/scummvm/scummvm/commit/9ccadff907647e1a6181ec679b1589901a9f9cf7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:28-04:00
Commit Message:
SCI: Fix LB2 museum music script bugs
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 401cbcc3bd6..ae5f8b53c20 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -10030,6 +10030,92 @@ static const uint16 laurabow2CDPatchFixIntroMusic[] = {
PATCH_END
};
+// At the start of act 4, if actBreak (room 26) finishes before its music fades
+// out then the CD version gets stuck playing the happy act break music instead
+// of the suspenseful museum music. This happens when quickly closing the
+// message at the end of the break or even if the message is just one of the
+// shorter ones. This is another CD regression due to Sound class changes.
+//
+// actBreak plays sound 30 using gameMusic1. After the act 4 break, rm510:init
+// re-initializes music with WrapMusic:init. WrapMusic also uses gameMusic1,
+// and it only plays a new sound if gameMusic1:prevSignal equals 0 or -1.
+// In floppy versions this was always true because Sound:play resets prevSignal
+// to 0, but CD doesn't. gameMusic1:prevSignal is 254 at the end of act 3 so if
+// the actBreak fade completes in the CD version then the interpreter sets the
+// signal to -1 and the music correctly changes. But if rm510:init runs before
+// the fade completes then WrapMusic keeps playing sound 30 throughout act 4.
+//
+// We fix this by setting gameMusic1:prevSignal to 0 at the end of actBreak.
+// We make room by overwriting a script's dispose call. The call is unnecessary
+// because the room is already changing and that also disposes the script.
+//
+// Applies to: English CD
+// Responsible method: sBreakIt:changeState(9)
+static const uint16 laurabow2CDSignatureFixAct4WrongMusic[] = {
+ 0x81, 0x66, // lag 66
+ 0x4a, 0x0c, // send 0c [ gameMusic1 fade: ... ]
+ 0xc1, 0x7b, // +ag 7b
+ 0x35, 0x00, // ldi 00
+ 0xa1, SIG_MAGICDWORD, 0x7c, // sag 7c
+ 0x38, SIG_UINT16(0x0183), // pushi 0183 [ newRoom, CD selector ]
+ SIG_ADDTOOFFSET(+7),
+ 0x39, 0x6f, // pushi dispose
+ 0x76, // push0
+ 0x54, 0x04, // self 04 [ self dispose: (unnecessary )]
+ SIG_END
+};
+
+static const uint16 laurabow2CDPatchFixAct4WrongMusic[] = {
+ 0x38, PATCH_UINT16(0x00ab), // pushi 00ab [ prevSignal ]
+ 0x78, // push1
+ 0x76, // push0
+ 0xc1, 0x7b, // +ag 7b
+ 0x76, // push0
+ 0xa9, 0x7c, // ssg 7c
+ PATCH_ADDTOOFFSET(+10),
+ 0x80, PATCH_UINT16(0x0066), // lag 0066
+ 0x4a, 0x12, // send 12 [ gameMusic1 fade: ... prevSignal: 0 ]
+ PATCH_END
+};
+
+// The music volume in acts 3 and 4 can be permanently lowered by clock chimes.
+//
+// In acts 3 and 4, WrapMusic plays sounds 90 through 93 in a loop in most
+// museum rooms. WrapMusic:vol contains the volume that the music should start
+// at and fade to when unpausing. It's initialized to 127 (max) and no other
+// scripts change this. WrapMusic:vol is effectively the maximum volume for the
+// gameMusic1 Sound object. Once lowered, it can never be raised.
+//
+// WrapMusic:cue records gameMusic1:vol in WrapMusic:vol when both objects are
+// in certain states. When a body is discovered, multiple fades occur at once,
+// and if the clock is shown then it applies its own fades and tries to save
+// and restore all other Sound volumes. Depending on timings such as the game
+// speed setting and the system clock's sub-second value, WrapMusic:cue can run
+// when gameMusic1:vol is less than 127. This permanently lowers the volume and
+// can occur multiple times. It's most likely to occur when discovering the
+// body in the dinosaur room (430).
+//
+// We fix this by always updating WrapMusic:vol to 127 since the game doesn't
+// expect it to change. This also fixes save games created before this patch.
+//
+// Applies to: All versions
+// Responsible method: WrapMusic:cue
+static const uint16 laurabow2SignatureMuseumMusicVolume[] = {
+ 0x39, 0x5e, // pushi vol [ same selector in all versions ]
+ 0x76, // push0
+ 0x63, 0x16, // pToa wrapSound
+ SIG_MAGICDWORD,
+ 0x4a, 0x04, // send 04 [ wrapSound vol? ]
+ 0x65, 0x1c, // aTop vol
+ SIG_END
+};
+
+static const uint16 laurabow2PatchMuseumMusicVolume[] = {
+ 0x35, 0x7f, // ldi 7f
+ 0x32, PATCH_UINT16(0x0002), // jmp 0002 [ vol = 127 ]
+ PATCH_END
+};
+
// LB2CD reduces the music volume significantly during the introduction when
// characters talk while disembarking the ship in room 120. This is done so
// that their speech can be heard but it also occurs in text-only mode.
@@ -10173,7 +10259,9 @@ static const uint16 laurabow2CDPatchAudioTextMenuSupport2[] = {
// script, description, signature patch
static const SciScriptPatcherEntry laurabow2Signatures[] = {
{ true, 560, "CD: painting closing immediately", 1, laurabow2CDSignaturePaintingClosing, laurabow2CDPatchPaintingClosing },
+ { true, 0, "CD/Floppy: museum music volume", 1, laurabow2SignatureMuseumMusicVolume, laurabow2PatchMuseumMusicVolume },
{ true, 0, "CD: fix problematic icon bar", 1, laurabow2CDSignatureFixProblematicIconBar, laurabow2CDPatchFixProblematicIconBar },
+ { true, 26, "CD: fix act 4 wrong music", 1, laurabow2CDSignatureFixAct4WrongMusic, laurabow2CDPatchFixAct4WrongMusic },
{ true, 90, "CD: fix yvette's tut response", 1, laurabow2CDSignatureFixYvetteTutResponse, laurabow2CDPatchFixYvetteTutResponse },
{ true, 110, "CD: fix intro music", 1, laurabow2CDSignatureFixIntroMusic, laurabow2CDPatchFixIntroMusic },
{ true, 350, "CD/Floppy: museum party fix entering south 1/2", 1, laurabow2SignatureMuseumPartyFixEnteringSouth1, laurabow2PatchMuseumPartyFixEnteringSouth1 },
Commit: 78a6a93fafe866b46d2cccab7f06dc3c6423b90f
https://github.com/scummvm/scummvm/commit/78a6a93fafe866b46d2cccab7f06dc3c6423b90f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:29-04:00
Commit Message:
SCI: Fix LB2 error when clicking dagger case
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 ae5f8b53c20..a6f3816fb74 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -9640,6 +9640,31 @@ static const uint16 laurabow2PatchFixArmorHallDoorPathfinding[] = {
PATCH_END
};
+// Clicking most inventory items on the Dagger of Amon Ra case in the Egyptian
+// exhibit errors the floppy versions. The doVerb methods contain nonsensical
+// instructions that attempt to access a non-existent class and property.
+// This would silently fail in the original. It was fixed in the CD version.
+//
+// We patch out the illegal class instructions to avoid the error.
+//
+// Applies to: All floppy versions
+// Responsible methods: glass:doVerb, daggerCase:doVerb
+static const uint16 laurabow2SignatureFixDaggerCaseError[] = {
+ 0x81, SIG_MAGICDWORD, 0x5b, // lag 5b
+ 0x4a, 0x0a, // send 4a
+ 0x33, SIG_ADDTOOFFSET(+1), // jmp [ end of method ]
+ 0x50, SIG_ADDTOOFFSET(+2), // class ????
+ SIG_END
+};
+
+static const uint16 laurabow2PatchFixDaggerCaseError[] = {
+ PATCH_ADDTOOFFSET(+6),
+ 0x18, // not [ acc = 1 ]
+ 0x3a, // toss
+ 0x48, // ret
+ PATCH_END
+};
+
// The crate room (room 460) in act 5 locks up the game if you enter from the
// elevator (room 660), swing the hanging crate, and then attempt to leave
// back through the elevator door.
@@ -10269,6 +10294,7 @@ static const SciScriptPatcherEntry laurabow2Signatures[] = {
{ true, 430, "CD/Floppy: make wired east door persistent", 1, laurabow2SignatureRememberWiredEastDoor, laurabow2PatchRememberWiredEastDoor },
{ true, 430, "CD/Floppy: fix wired east door", 1, laurabow2SignatureFixWiredEastDoor, laurabow2PatchFixWiredEastDoor },
{ true, 448, "CD/Floppy: fix armor hall door pathfinding", 1, laurabow2SignatureFixArmorHallDoorPathfinding, laurabow2PatchFixArmorHallDoorPathfinding },
+ { true, 450, "Floppy: fix dagger case error", 2, laurabow2SignatureFixDaggerCaseError, laurabow2PatchFixDaggerCaseError },
{ true, 460, "CD/Floppy: fix crate room east door lockup", 1, laurabow2SignatureFixCrateRoomEastDoorLockup, laurabow2PatchFixCrateRoomEastDoorLockup },
{ true, 2660, "CD/Floppy: fix elevator lockup", 1, laurabow2SignatureFixElevatorLockup, laurabow2PatchFixElevatorLockup },
{ true, 550, "CD/Floppy: fix back rub east entrance lockup", 1, laurabow2SignatureFixBackRubEastEntranceLockup, laurabow2PatchFixBackRubEastEntranceLockup },
Commit: d1cf428decc22687b9321a01bcb8b4cd29360aff
https://github.com/scummvm/scummvm/commit/d1cf428decc22687b9321a01bcb8b4cd29360aff
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-08-19T07:12:29-04:00
Commit Message:
SCI: Fix LB2 CD Wolf and O'Riley actor loops
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 a6f3816fb74..1f8729586bd 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -9446,6 +9446,43 @@ static const uint16 laurabow2CDPatchFixYvetteTutResponse[] = {
PATCH_END
};
+// In the CD version, Wolf stands facing the wrong direction in most scenes.
+// O'Riley also does this in the Old Masters Gallery. Their views were reduced
+// from nine loops to five in the CD version, but the scripts weren't updated.
+// They still set the actors' loops to eight instead of four. kAnimate adjusts
+// invalid cels and the result is usually the last cel in the last loop, which
+// is the actor standing facing north west.
+//
+// We fix this by setting the correct loop in the CD version so that Wolf and
+// O'Riley face the direction the scripts request like in the floppy versions.
+// This patch is only enabled in the CD version since the scripts don't change.
+//
+// Applies to: English CD
+// Responsible methods: sPartysOver:changeState, rm400:init, sHeimlichShoos:changeState
+// sEnterNorth:changeState, rm500:init, rm650:init
+static const uint16 laurabow2CDSignatureFixMuseumActorLoops1[] = {
+ 0x38, SIG_SELECTOR16(setLoop), // pushi setLoop
+ 0x78, // push1
+ 0x39, SIG_MAGICDWORD, 0x08, // pushi 08 [ standing loop in floppy ]
+ 0x38, SIG_SELECTOR16(setCel), // pushi setCel
+ SIG_END
+};
+
+static const uint16 laurabow2CDSignatureFixMuseumActorLoops2[] = {
+ 0x39, SIG_SELECTOR8(loop), // pushi loop
+ 0x78, // push1
+ SIG_MAGICDWORD,
+ 0x39, 0x08, // pushi 08 [ standing loop in floppy ]
+ 0x39, SIG_SELECTOR8(cel), // pushi cel
+ SIG_END
+};
+
+static const uint16 laurabow2CDPatchFixMuseumActorLoops[] = {
+ PATCH_ADDTOOFFSET(+4),
+ 0x39, 0x04, // pushi 04 [ standing loop in CD ]
+ PATCH_END
+};
+
// When entering the main musem party room (w/ the golden Egyptian head), Laura
// is walking a bit into the room automatically. If you press a mouse button
// while this is happening, you will get stuck inside that room and won't be
@@ -10291,11 +10328,15 @@ static const SciScriptPatcherEntry laurabow2Signatures[] = {
{ true, 110, "CD: fix intro music", 1, laurabow2CDSignatureFixIntroMusic, laurabow2CDPatchFixIntroMusic },
{ true, 350, "CD/Floppy: museum party fix entering south 1/2", 1, laurabow2SignatureMuseumPartyFixEnteringSouth1, laurabow2PatchMuseumPartyFixEnteringSouth1 },
{ true, 350, "CD/Floppy: museum party fix entering south 2/2", 1, laurabow2SignatureMuseumPartyFixEnteringSouth2, laurabow2PatchMuseumPartyFixEnteringSouth2 },
+ { false, 355, "CD: fix museum actor loops", 2, laurabow2CDSignatureFixMuseumActorLoops1, laurabow2CDPatchFixMuseumActorLoops },
{ true, 430, "CD/Floppy: make wired east door persistent", 1, laurabow2SignatureRememberWiredEastDoor, laurabow2PatchRememberWiredEastDoor },
{ true, 430, "CD/Floppy: fix wired east door", 1, laurabow2SignatureFixWiredEastDoor, laurabow2PatchFixWiredEastDoor },
{ true, 448, "CD/Floppy: fix armor hall door pathfinding", 1, laurabow2SignatureFixArmorHallDoorPathfinding, laurabow2PatchFixArmorHallDoorPathfinding },
+ { false, 400, "CD: fix museum actor loops", 4, laurabow2CDSignatureFixMuseumActorLoops1, laurabow2CDPatchFixMuseumActorLoops },
+ { false, 420, "CD: fix museum actor loops", 1, laurabow2CDSignatureFixMuseumActorLoops1, laurabow2CDPatchFixMuseumActorLoops },
{ true, 450, "Floppy: fix dagger case error", 2, laurabow2SignatureFixDaggerCaseError, laurabow2PatchFixDaggerCaseError },
{ true, 460, "CD/Floppy: fix crate room east door lockup", 1, laurabow2SignatureFixCrateRoomEastDoorLockup, laurabow2PatchFixCrateRoomEastDoorLockup },
+ { false, 500, "CD: fix museum actor loops", 3, laurabow2CDSignatureFixMuseumActorLoops1, laurabow2CDPatchFixMuseumActorLoops },
{ true, 2660, "CD/Floppy: fix elevator lockup", 1, laurabow2SignatureFixElevatorLockup, laurabow2PatchFixElevatorLockup },
{ true, 550, "CD/Floppy: fix back rub east entrance lockup", 1, laurabow2SignatureFixBackRubEastEntranceLockup, laurabow2PatchFixBackRubEastEntranceLockup },
{ true, 550, "CD/Floppy: fix disappearing desk items", 1, laurabow2SignatureFixDisappearingDeskItems, laurabow2PatchFixDisappearingDeskItems },
@@ -10304,6 +10345,7 @@ static const SciScriptPatcherEntry laurabow2Signatures[] = {
{ true, 448, "CD/Floppy: handle armor hall room events", 1, laurabow2SignatureHandleArmorRoomEvents, laurabow2PatchHandleArmorRoomEvents },
{ true, 600, "Floppy: fix bugs with meat", 1, laurabow2FloppySignatureFixBugsWithMeat, laurabow2FloppyPatchFixBugsWithMeat },
{ true, 600, "CD: fix bugs with meat", 1, laurabow2CDSignatureFixBugsWithMeat, laurabow2CDPatchFixBugsWithMeat },
+ { false, 650, "CD: fix museum actor loops", 1, laurabow2CDSignatureFixMuseumActorLoops2, laurabow2CDPatchFixMuseumActorLoops },
{ true, 480, "CD: fix act 5 finale music", 1, laurabow2CDSignatureFixAct5FinaleMusic, laurabow2CDPatchFixAct5FinaleMusic },
{ true, 28, "disable speed test", 1, sci11SpeedTestSignature, sci11SpeedTestPatch },
{ true, 120, "CD: disable intro volume change in text mode", 1, laurabow2CDSignatureIntroVolumeChange, laurabow2CDPatchIntroVolumeChange },
@@ -24054,6 +24096,9 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) {
break;
case GID_LAURABOW2:
if (g_sci->isCD()) {
+ // Enable patches due views having fewer loops in the CD version
+ enablePatch(signatureTable, "CD: fix museum actor loops");
+
// Enables Dual mode patches (audio + subtitles at the same time) for Laura Bow 2
enablePatch(signatureTable, "CD: audio + text support");
}
More information about the Scummvm-git-logs
mailing list