diff options
| author | Colin Snover | 2017-09-16 14:33:44 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-16 16:33:09 -0500 |
| commit | e400f1aec29ff0d4825c0aad75e56e22bfb56a2f (patch) | |
| tree | 4df1f880b4631f45f0b8ce862926c8a6b966fb46 | |
| parent | d1c43b24ea3d0d6fa57ba6b374dc0a22427ec7fc (diff) | |
| download | scummvm-rg350-e400f1aec29ff0d4825c0aad75e56e22bfb56a2f.tar.gz scummvm-rg350-e400f1aec29ff0d4825c0aad75e56e22bfb56a2f.tar.bz2 scummvm-rg350-e400f1aec29ff0d4825c0aad75e56e22bfb56a2f.zip | |
SCI32: Clean-up pass on Torin script patches
* Convert selector literals to SIG_SELECTOR/PATCH_SELECTOR
| -rw-r--r-- | engines/sci/engine/script_patches.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp index 4f3cdea2fd..8a2800d147 100644 --- a/engines/sci/engine/script_patches.cpp +++ b/engines/sci/engine/script_patches.cpp @@ -136,7 +136,7 @@ static const char *const selectorNameTable[] = { "font", // KQ7 "setScale", // LSL6hires "setScaler", // LSL6hires - "readWord", // LSL7, Phant1 + "readWord", // LSL7, Phant1, Torin "flag", // PQ4 "select", // PQ4 #endif @@ -6277,14 +6277,14 @@ static const uint16 torinVolumeResetPatch1[] = { // Applies to at least: English CD static const uint16 torinVolumeResetSignature2[] = { SIG_MAGICDWORD, - 0x38, SIG_UINT16(0x20b), // pushi $020b - 0x76, // push0 - SIG_ADDTOOFFSET(6), // advance file stream - 0xa1, 0xe3, // sag $e3 (music volume) - SIG_ADDTOOFFSET(10), // advance file stream - 0xa1, 0xe4, // sag $e4 (sfx volume) - SIG_ADDTOOFFSET(10), // advance file stream - 0xa1, 0xe5, // sag $e5 (speech volume) + 0x38, SIG_SELECTOR16(readWord), // pushi $020b (readWord) + 0x76, // push0 + SIG_ADDTOOFFSET(6), // advance file stream + 0xa1, 0xe3, // sag $e3 (music volume) + SIG_ADDTOOFFSET(10), // advance file stream + 0xa1, 0xe4, // sag $e4 (sfx volume) + SIG_ADDTOOFFSET(10), // advance file stream + 0xa1, 0xe5, // sag $e5 (speech volume) SIG_END }; @@ -6500,8 +6500,8 @@ static const uint16 torinPointSoft20700HeapPatch[] = { static const SciScriptPatcherEntry torinSignatures[] = { { true, 20600, "fix wrong boogle bag flag on fast-forward", 1, torinSeraglioBoogleFlagSignature, torinSeraglioBoogleFlagPatch }, { true, 20700, "fix bad heap in PointSoft release", 1, torinPointSoft20700HeapSignature, torinPointSoft20700HeapPatch }, - { true, 64000, "disable volume reset on startup 1/2", 1, torinVolumeResetSignature1, torinVolumeResetPatch1 }, - { true, 64000, "disable volume reset on startup 2/2", 1, torinVolumeResetSignature2, torinVolumeResetPatch2 }, + { true, 64000, "disable volume reset on startup (1/2)", 1, torinVolumeResetSignature1, torinVolumeResetPatch1 }, + { true, 64000, "disable volume reset on startup (2/2)", 1, torinVolumeResetSignature2, torinVolumeResetPatch2 }, { true, 64866, "increase number of save games", 1, torinLarry7NumSavesSignature, torinLarry7NumSavesPatch }, SCI_SIGNATUREENTRY_TERMINATOR }; |