aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorColin Snover2017-09-16 14:32:44 -0500
committerColin Snover2017-09-16 16:33:09 -0500
commit3b7e6103647143d916b3ec93acd6d07c621c9a5c (patch)
tree7a20465d1737b4bb38fac246f2c94f4cf09f4246 /engines/sci/engine
parentc5dce17b1f1392feb8825aba5addbc3999eeaa51 (diff)
downloadscummvm-rg350-3b7e6103647143d916b3ec93acd6d07c621c9a5c.tar.gz
scummvm-rg350-3b7e6103647143d916b3ec93acd6d07c621c9a5c.tar.bz2
scummvm-rg350-3b7e6103647143d916b3ec93acd6d07c621c9a5c.zip
SCI32: Clean-up pass on QFG4 script patches
* Convert selector literals to SIG_SELECTOR/PATCH_SELECTOR * Make identifier suffixes and patch descriptions consistent
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/script_patches.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index c86e5c141f..af9278f2df 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -5478,7 +5478,7 @@ static const SciScriptPatcherEntry qfg3Signatures[] = {
// The trap init code incorrectly creates an int array for string data.
// Applies to at least: English CD
-static const uint16 qfg4SignatureTrapArrayType[] = {
+static const uint16 qfg4TrapArrayTypeSignature[] = {
0x38, SIG_SELECTOR16(new), // pushi new
0x78, // push1
0x38, SIG_UINT16(0x80), // pushi $80 (128)
@@ -5488,7 +5488,7 @@ static const uint16 qfg4SignatureTrapArrayType[] = {
SIG_END
};
-static const uint16 qfg4PatchTrapArrayType[] = {
+static const uint16 qfg4TrapArrayTypePatch[] = {
PATCH_ADDTOOFFSET(+4), // pushi $92 (new), push1
0x38, PATCH_UINT16(0x100), // pushi $100 (256)
0x51, 0x0d, // class $d (ByteArray)
@@ -5503,7 +5503,7 @@ static const uint16 qfg4BenchmarkSignature[] = {
0x51, SIG_ADDTOOFFSET(+1), // class View
0x4a, SIG_UINT16(0x04), // send 4
0xa5, 0x00, // sat 0
- 0x39, 0x0e, // pushi $e
+ 0x39, SIG_SELECTOR8(view), // pushi $e (view)
SIG_MAGICDWORD,
0x78, // push1
0x38, SIG_UINT16(0x270f), // push $270f (9999)
@@ -5521,9 +5521,9 @@ static const uint16 qfg4BenchmarkPatch[] = {
static const SciScriptPatcherEntry qfg4Signatures[] = {
{ true, 1, "disable volume reset on startup", 1, sci2VolumeResetSignature, sci2VolumeResetPatch },
{ true, 1, "disable video benchmarking", 1, qfg4BenchmarkSignature, qfg4BenchmarkPatch },
- { true, 83, "fix incorrect array type", 1, qfg4SignatureTrapArrayType, qfg4PatchTrapArrayType },
- { true, 64990, "increase number of save games", 1, sci2NumSavesSignature1, sci2NumSavesPatch1 },
- { true, 64990, "increase number of save games", 1, sci2NumSavesSignature2, sci2NumSavesPatch2 },
+ { true, 83, "fix incorrect array type", 1, qfg4TrapArrayTypeSignature, qfg4TrapArrayTypePatch },
+ { true, 64990, "increase number of save games (1/2)", 1, sci2NumSavesSignature1, sci2NumSavesPatch1 },
+ { true, 64990, "increase number of save games (2/2)", 1, sci2NumSavesSignature2, sci2NumSavesPatch2 },
{ true, 64990, "disable change directory button", 1, sci2ChangeDirSignature, sci2ChangeDirPatch },
SCI_SIGNATUREENTRY_TERMINATOR
};