[Scummvm-git-logs] scummvm master -> 56896dd51565b9db62f0a2ba427b922c67935410
sev-
noreply at scummvm.org
Mon Sep 8 18:20:17 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
7f598cae62 SCI: Temporarily disable ECO1 speed patch
56896dd515 JANITORIAL: Remove trailing spaces
Commit: 7f598cae620ff4ac04eaf122d3b8fa0fba621208
https://github.com/scummvm/scummvm/commit/7f598cae620ff4ac04eaf122d3b8fa0fba621208
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-08T20:19:48+02:00
Commit Message:
SCI: Temporarily disable ECO1 speed patch
This disables commit 576f2cd03325a4bcab429d4ae66bdc288c9830b5
SCI: Fix ECO1 speeds in Flesh-Eater scene
moveSpeed is defined only in SCI32 and this breaks compilation
with SCI0-1.1-only
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 928a0a6bd97..b96c7fda97f 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1717,6 +1717,7 @@ static const uint16 ecoquest1SignatureFleshEaterEgoSpeed[] = {
SIG_END
};
+#if 0
static const uint16 ecoquest1PatchFleshEaterEgoSpeed[] = {
0x38, PATCH_UINT16(0x0006), // pushi 0006
0x38, PATCH_SELECTOR16(moveSpeed), // pushi moveSpeed
@@ -1726,11 +1727,12 @@ static const uint16 ecoquest1PatchFleshEaterEgoSpeed[] = {
0x4a, 0x14, // send 14 [ ego cycleSpeed: 6 moveSpeed: 3 ... ]
PATCH_END
};
+#endif
// script, description, signature patch
static const SciScriptPatcherEntry ecoquest1Signatures[] = {
{ true, 123, "flesh-eater inset speed", 1, ecoquest1SignatureFleshEaterInsetSpeed, ecoquest1PatchFleshEaterInsetSpeed },
- { true, 123, "flesh-eater ego speed", 1, ecoquest1SignatureFleshEaterEgoSpeed, ecoquest1PatchFleshEaterEgoSpeed },
+// { true, 123, "flesh-eater ego speed", 1, ecoquest1SignatureFleshEaterEgoSpeed, ecoquest1PatchFleshEaterEgoSpeed },
{ true, 140, "CD: mosaic puzzle fix", 2, ecoquest1SignatureMosaicPuzzleFix, ecoquest1PatchMosaicPuzzleFix },
{ true, 160, "CD: give superfluous oily shell", 1, ecoquest1SignatureGiveOilyShell, ecoquest1PatchGiveOilyShell },
{ true, 160, "CD/Floppy: column puzzle fix", 1, ecoquest1SignatureColumnPuzzleFix, ecoquest1PatchColumnPuzzleFix },
Commit: 56896dd51565b9db62f0a2ba427b922c67935410
https://github.com/scummvm/scummvm/commit/56896dd51565b9db62f0a2ba427b922c67935410
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-08T20:19:48+02:00
Commit Message:
JANITORIAL: Remove trailing spaces
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 b96c7fda97f..198be140cb3 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2161,17 +2161,17 @@ static const uint16 fangamePatchVolumeSlider2[] = {
// Fan games based on the SCI Studio template reset their volume to 15 (max) in
// the init method of their game object in script 0. As with most SCI32 games,
// we patch this out so that the volume stored in ScummVM is used.
-//
+//
// Applies to: Fan games built with the SCI Studio / SCI Companion SCI0 template
// Responsible method: Template:init (the Game object in script 0)
// Fixes bug: #13795
static const uint16 fangameSignatureVolumeReset1[] = {
0x35, 0x0f, // ldi 0f
- SIG_ADDTOOFFSET(+1), 0x1d, // sag 1d [ sag or sal depending on compiler ]
+ SIG_ADDTOOFFSET(+1), 0x1d, // sag 1d [ sag or sal depending on compiler ]
SIG_ADDTOOFFSET(+1), // push2 [ opcode 7b instead of 7a in some games ]
0x39, 0x08, // pushi 08 [ volume ]
SIG_ADDTOOFFSET(+1), // lsg 1d [ lsg or lsl depending on compiler ]
- SIG_MAGICDWORD, 0x1d,
+ SIG_MAGICDWORD, 0x1d,
0x43, 0x31, 0x04, // callk DoSound 04
SIG_END
};
@@ -2740,13 +2740,13 @@ static const uint16 hoyle4PatchEuchreHandsOff[] = {
static const uint16 hoyle4SignatureHeartsStrategy[] = {
0x8d, 0x00, // lst 00 [ temp0, uninitialized ]
0x81, SIG_MAGICDWORD, 0x75, // lag 75 [ theHands ]
- 0x4a, 0x06, // send 06 [ theHands at: temp0 ]
+ 0x4a, 0x06, // send 06 [ theHands at: temp0 ]
0x48, // ret
SIG_END
};
static const uint16 hoyle4PatchHeartsStrategy[] = {
- 0x8f, 0x01, // lsp 01 [ param1, the player (0-3) ]
+ 0x8f, 0x01, // lsp 01 [ param1, the player (0-3) ]
PATCH_END
};
@@ -3026,13 +3026,13 @@ static const uint16 hoyle5PatchSolitaireInit[] = {
static const uint16 hoyle5SignatureHeartsStrategy[] = {
0x8d, 0x00, // lst 00 [ temp0, uninitialized ]
0x81, SIG_MAGICDWORD, 0x75, // lag 75 [ theHands ]
- 0x4a, SIG_UINT16(0x0006), // send 06 [ theHands at: temp0 ]
+ 0x4a, SIG_UINT16(0x0006), // send 06 [ theHands at: temp0 ]
0x48, // ret
SIG_END
};
static const uint16 hoyle5PatchHeartsStrategy[] = {
- 0x8f, 0x01, // lsp 01 [ param1, the player (0-3) ]
+ 0x8f, 0x01, // lsp 01 [ param1, the player (0-3) ]
PATCH_END
};
@@ -4562,7 +4562,7 @@ static const uint16 gk1EndGameFontPatch[] = {
// version does use a SCI2.1 interpreter.
//
// Applies to: Italian fan translation, PC CD version
-// Responsible methods: DEdit:hilite, DText:dispose, DText:draw, DSelector:dispose,
+// Responsible methods: DEdit:hilite, DText:dispose, DText:draw, DSelector:dispose,
// SRDialog:update, BookButton:hilite, TapeButton:doit
// TellerButton:hilite, TopicButton:hilite
static const uint16 gk1ItalianTranslationSignature[] = {
@@ -9538,7 +9538,7 @@ static const uint16 larry5PatchUpdateStopGroopClient[] = {
0x89, 0x00, // lsg 00
0x81, 0x64, // lag 64
0x4a, 0x06, // send 06 [ stopGroop client: ego ]
- 0x33, 0x05, // jmp 05 [ toss, ret ]
+ 0x33, 0x05, // jmp 05 [ toss, ret ]
PATCH_END
};
@@ -10014,7 +10014,7 @@ static const uint16 larry6HiresMacVolumeRestorePatch[] = {
// This shouldn't affect ScummVM since we don't use RESOURCE.CFG, but something
// about the way the collection was packaged causes players to continue to miss
// this directory and not realize until it's too late. The lockup occurs late
-// in the game and adding the missing patch files invalidates all saves.
+// in the game and adding the missing patch files invalidates all saves.
//
// We don't generally fix "bugs" that are consequences of not providing all of
// the game's data files, but this is a severe case that keeps coming up.
@@ -12178,7 +12178,7 @@ static const uint16 laurabow2CDPatchFixBugsWithMeat[] = {
// itself doesn't work, instead the player has to click on the surrounding area
// to look at it or pick it up. bone:doVerb calls dinoBones:doVerb but doesn't
// pass the verb parameter. We fix this by increasing the &rest parameter.
-//
+//
// Applies to: All versions
// Responsible method: bone:doVerb
static const uint16 laurabow2SignatureFixDinosaurBone[] = {
@@ -14095,7 +14095,7 @@ static const uint16 pepperPatchGlassJar[] = {
// goal state. The puzzle can only be completed by pressing the Help button,
// because it "solves" the puzzle one tile at a time by swapping them instead
// of sliding. Swapping tiles can place the puzzle in a solvable state.
-//
+//
// We have verified this with sliding tile puzzle solver programs. They reject
// the initial state as unsolvable. There is no indication that this was the
// intention for the puzzle box.
@@ -17194,7 +17194,7 @@ static const uint16 qfg3PatchRingRopePrize[] = {
// events that they've met the preconditions for. Note that these changes are
// broken up into smaller patches to be compatible with the many different
// versions of these scripts, including the NRS fan patches that GOG includes,
-// and the comprehensive QFG3 Unofficial Update fan patches.
+// and the comprehensive QFG3 Unofficial Update fan patches.
//
// Applies to: All versions
// Responsible methods: rm450:init, rm420:init
@@ -17242,7 +17242,7 @@ static const uint16 qfg3SignatureLaibonHutEvents3[] = {
SIG_MAGICDWORD,
0x35, 0x05, // ldi 05
0xa3, 0x0b, // sal 0b [ room event = 5 ]
- 0x33, // jmp [ exit cond ]
+ 0x33, // jmp [ exit cond ]
SIG_END
};
@@ -17256,7 +17256,7 @@ static const uint16 qfg3PatchLaibonHutEvents3[] = {
0x31, 0x06, // bnt 06
0x35, 0x05, // ldi 05
0xa3, 0x0b, // sal 0b [ room event = 5 ]
- 0x33, 0x06, // jmp 06 [ exit cond ]
+ 0x33, 0x06, // jmp 06 [ exit cond ]
0x8a, PATCH_UINT16(0x000b), // lsl 000b
0x35, 0x06, // ldi 06
0x1a, // eq? [ is room event 6? ]
@@ -17280,7 +17280,7 @@ static const uint16 qfg3SignatureNrsLaibonHutEvents3[] = {
SIG_MAGICDWORD,
0x35, 0x05, // ldi 05
0xa3, 0x0b, // sal 0b [ room event = 5 ]
- 0x32, // jmp [ exit cond ]
+ 0x32, // jmp [ exit cond ]
SIG_END
};
@@ -17294,7 +17294,7 @@ static const uint16 qfg3PatchNrsLaibonHutEvents3[] = {
0x30, PATCH_UINT16(0x0007), // bnt 0007
0x35, 0x05, // ldi 05
0xa3, 0x0b, // sal 0b [ room event = 5 ]
- 0x32, PATCH_UINT16(0x0006), // jmp 0006 [ exit cond ]
+ 0x32, PATCH_UINT16(0x0006), // jmp 0006 [ exit cond ]
0x8a, PATCH_UINT16(0x000b), // lsl 000b
0x35, 0x06, // ldi 06
0x1a, // eq? [ is room event 6? ]
More information about the Scummvm-git-logs
mailing list