[Scummvm-git-logs] scummvm master -> 9f45ba1e593c8125d59520a248aa3152c1bf43a5
sluicebox
noreply at scummvm.org
Mon Mar 7 22:18:39 UTC 2022
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:
13fbaf794c SCI32: Fix QFG4 crashes when pressing direction keys
9f45ba1e59 SCI: Fix some SQ3 detection table flags
Commit: 13fbaf794cc3da95c931b6cc7c0aca9f302fe16d
https://github.com/scummvm/scummvm/commit/13fbaf794cc3da95c931b6cc7c0aca9f302fe16d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-03-07T17:06:17-05:00
Commit Message:
SCI32: Fix QFG4 crashes when pressing direction keys
Now that we correctly pass direction key events to QFG4,
we need to patch the script bugs that they trigger.
These crashes also occur in the original game.
See: 1b4660a50899a697f16cc8d09443cbb10e08e44a
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 52058498024..869982bae77 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -192,6 +192,7 @@ static const char *const selectorNameTable[] = {
"priority", // RAMA
"plane", // RAMA
"getSubscriberObj", // RAMA
+ "advance", // QFG4
"advanceCurIcon", // QFG4
"amount", // QFG4
"cue", // QFG4
@@ -199,6 +200,7 @@ static const char *const selectorNameTable[] = {
"getCursor", // QFG4
"heading", // QFG4
"moveSpeed", // QFG4
+ "retreat", // QFG4
"sayMessage", // QFG4
"setLooper", // QFG4
"useStamina", // QFG4
@@ -324,6 +326,7 @@ enum ScriptPatcherSelectors {
SELECTOR_priority,
SELECTOR_plane,
SELECTOR_getSubscriberObj,
+ SELECTOR_advance,
SELECTOR_advanceCurIcon,
SELECTOR_amount,
SELECTOR_cue,
@@ -331,6 +334,7 @@ enum ScriptPatcherSelectors {
SELECTOR_getCursor,
SELECTOR_heading,
SELECTOR_moveSpeed,
+ SELECTOR_retreat,
SELECTOR_sayMessage,
SELECTOR_setLooper,
SELECTOR_useStamina,
@@ -18217,6 +18221,65 @@ static const uint16 qfg4MagicShieldViewPatch[] = {
PATCH_END
};
+// Pressing the up or down arrow keys on the character screen crashes the game.
+// There are two character screens: the creation screen in room 140 and the
+// read-only screen in script 15 that can be viewed during the game. Both are
+// named charInitScreen and are similar. It appears that some event handling
+// code from the former was copied into the latter. This code crashes upon
+// attempting to select non-existent objects.
+//
+// We fix this by patching out the direction event handler.
+//
+// Applies to: All versions
+// Responsible method: charInitScreen:dispatchEvent
+static const uint16 qfg4CharScreenKeyboardSignature[] = {
+ SIG_MAGICDWORD,
+ 0x8d, 0x02, // lst 02 [ event type ]
+ 0x35, 0x10, // ldi 10 [ direction ]
+ 0x12, // and
+ SIG_END
+};
+
+static const uint16 qfg4CharScreenKeyboardPatch[] = {
+ 0x39, 0x00, // pushi 00 [ ignore direction events ]
+ PATCH_END
+};
+
+// Pressing arrow keys or tab on the death screen crashes the game. The screen
+// has code that attempts to cycle through and select the current control, but
+// it's quite confused. DeathControls is an IconBar and all the screen elements
+// are DeathIcons, but icons are expected to be clickable things that can be
+// selected and highlighted. This doesn't make sense for the static picture and
+// text, and they don't have any of the properties necessary to make that work.
+// When the common IconBar code attempts to select these, DeathIcon:highlight
+// proptly crashes upon trying to use and draw non-existant objects.
+//
+// We fix this by patching out the broken control cycling on the death screen.
+// Note that this code was unable to even highlight the real clickable icons.
+//
+// Applies to: All versions
+// Responsible method: DeathControls:dispatchEvents
+static const uint16 qfg4DeathScreenKeyboardSignature1[] = {
+ SIG_MAGICDWORD,
+ 0x38, SIG_SELECTOR16(advance), // pushi advance
+ 0x76, // push0
+ 0x54, SIG_UINT16(0x0004), // send 04 [ self advance: ]
+ SIG_END
+};
+
+static const uint16 qfg4DeathScreenKeyboardSignature2[] = {
+ SIG_MAGICDWORD,
+ 0x38, SIG_SELECTOR16(retreat), // pushi retreat
+ 0x76, // push0
+ 0x54, SIG_UINT16(0x0004), // send 04 [ self retreat: ]
+ SIG_END
+};
+
+static const uint16 qfg4DeathScreenKeyboardPatch[] = {
+ 0x32, PATCH_UINT16(0x0004), // jmp 0004 [ don't cycle control ]
+ PATCH_END
+};
+
// script, description, signature patch
static const SciScriptPatcherEntry qfg4Signatures[] = {
{ true, 0, "prevent autosave from deleting save games", 1, qfg4AutosaveSignature, qfg4AutosavePatch },
@@ -18229,6 +18292,9 @@ static const SciScriptPatcherEntry qfg4Signatures[] = {
{ true, 11, "fix trigger after summon staff (1/2)", 1, qfg4TriggerStaffSignature1, qfg4TriggerStaffPatch1 },
{ true, 11, "fix trigger after summon staff (2/2)", 1, qfg4TriggerStaffSignature2, qfg4TriggerStaffPatch2 },
{ true, 13, "fix spell effect disposal", 1, qfg4EffectDisposalSignature, qfg4EffectDisposalPatch },
+ { true, 15, "fix character screen keyboard crash", 1, qfg4CharScreenKeyboardSignature, qfg4CharScreenKeyboardPatch },
+ { true, 26, "fix death screen keyboard crash", 3, qfg4DeathScreenKeyboardSignature1, qfg4DeathScreenKeyboardPatch },
+ { true, 26, "fix death screen keyboard crash", 3, qfg4DeathScreenKeyboardSignature2, qfg4DeathScreenKeyboardPatch },
{ true, 28, "fix lingering rations icon after eating", 1, qfg4LeftoversSignature, qfg4LeftoversPatch },
{ true, 31, "fix setScaler calls", 1, qfg4SetScalerSignature, qfg4SetScalerPatch },
{ true, 41, "fix conditional void calls", 3, qfg4ConditionalVoidSignature, qfg4ConditionalVoidPatch },
@@ -18384,7 +18450,7 @@ static const uint16 sq3EndCreditsPatch[] = {
// own client since any object will do and this ensures there are no conflicts.
//
// Responsible method: scumSoft:init
-// Applies to: English PC 1.018, French PC, German PC, German Amiga, Macintosh
+// Applies to: English PC 1.018, German PC, German Amiga, Macintosh
// Fixes bug: #13318
static const uint16 sq3AnnouncementsSignature[] = {
0x39, SIG_SELECTOR8(state), // pushi state
Commit: 9f45ba1e593c8125d59520a248aa3152c1bf43a5
https://github.com/scummvm/scummvm/commit/9f45ba1e593c8125d59520a248aa3152c1bf43a5
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-03-07T17:06:17-05:00
Commit Message:
SCI: Fix some SQ3 detection table flags
Changed paths:
engines/sci/detection_tables.h
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 27bd81c35db..025d40dd97c 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -5321,15 +5321,6 @@ static const struct ADGameDescription SciGameDescriptions[] = {
AD_LISTEND},
Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_PALETTEMODS },
- // Space Quest 3 - English Mac (from Fingolfin)
- {"sq3", "", {
- {"resource.map", 0, "5c931675c6e01c4b418faca85d76c92c", 5844},
- {"resource.001", 0, "0d8dfe42683b46f3131823233a91ce6a", 771917},
- {"resource.002", 0, "0d8dfe42683b46f3131823233a91ce6a", 794072},
- {"resource.003", 0, "0d8dfe42683b46f3131823233a91ce6a", 776536},
- AD_LISTEND},
- Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, GUIO_STD16_MAC_PALETTEMODS },
-
// Space Quest 3 - German DOS (from Tobis87, also includes english language)
// SCI interpreter version 0.000.453 (?)
{"sq3", "", {
@@ -5342,7 +5333,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"resource.006", 0, "9107c2aa5398e28b5c5406df13491f85", 320643},
{"resource.007", 0, "9107c2aa5398e28b5c5406df13491f85", 344287},
AD_LISTEND},
- Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_MAC_PALETTEMODS },
+ Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_PALETTEMODS },
// Space Quest 3 v1.052 - German DOS (supplied by markcoolio in bug report #4281, also includes english language)
// Executable scanning reports "S.old.114"
@@ -5354,6 +5345,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
AD_LISTEND},
Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_PALETTEMODS },
+ // Space Quest 3 - English Mac (from Fingolfin)
+ {"sq3", "", {
+ {"resource.map", 0, "5c931675c6e01c4b418faca85d76c92c", 5844},
+ {"resource.001", 0, "0d8dfe42683b46f3131823233a91ce6a", 771917},
+ {"resource.002", 0, "0d8dfe42683b46f3131823233a91ce6a", 794072},
+ {"resource.003", 0, "0d8dfe42683b46f3131823233a91ce6a", 776536},
+ AD_LISTEND},
+ Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, GUIO_STD16_MAC_PALETTEMODS },
+
// Space Quest 3 v1.1 (game says 0.016) - English Mac (supplied by misterhands in bug report #6484)
// Executable scanning reports "0.024"
{"sq3", "", {
@@ -5363,7 +5363,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"resource.003", 0, "0d8dfe42683b46f3131823233a91ce6a", 776554},
{"resource.004", 0, "0d8dfe42683b46f3131823233a91ce6a", 787066},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, GUIO_STD16_PALETTEMODS },
+ Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE, GUIO_STD16_MAC_PALETTEMODS },
#define GUIO_SQ4_CD GUIO5(GAMEOPTION_SQ4_SILVER_CURSORS, \
GAMEOPTION_PREFER_DIGITAL_SFX, \
More information about the Scummvm-git-logs
mailing list