diff options
author | Filippos Karapetis | 2019-05-12 22:00:35 +0300 |
---|---|---|
committer | Filippos Karapetis | 2019-05-12 22:00:35 +0300 |
commit | 048bab9115c7bdbcecbdb9e44a9467bf888b3e24 (patch) | |
tree | 397bb2cc45db9b450a0f0e46e76046007978a8a6 /engines/sci/engine | |
parent | 9551e64bdfc05954f41b665a3ae706f46304347e (diff) | |
download | scummvm-rg350-048bab9115c7bdbcecbdb9e44a9467bf888b3e24.tar.gz scummvm-rg350-048bab9115c7bdbcecbdb9e44a9467bf888b3e24.tar.bz2 scummvm-rg350-048bab9115c7bdbcecbdb9e44a9467bf888b3e24.zip |
SCI: Only apply the FPFP patch for view 844 when it's actually missing
This allows players to view the scene in the Mac version, if they have
copied the resource from the PC version. Requested by m_kiewitz
Diffstat (limited to 'engines/sci/engine')
-rw-r--r-- | engines/sci/engine/script_patches.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp index fe3399a16d..9ce574b12c 100644 --- a/engines/sci/engine/script_patches.cpp +++ b/engines/sci/engine/script_patches.cpp @@ -1304,7 +1304,7 @@ static const SciScriptPatcherEntry freddypharkasSignatures[] = { { true, 0, "CD: score early disposal", 1, freddypharkasSignatureScoreDisposal, freddypharkasPatchScoreDisposal }, { true, 15, "Mac: broken inventory", 1, freddypharkasSignatureMacInventory, freddypharkasPatchMacInventory }, { true, 110, "intro scaling workaround", 2, freddypharkasSignatureIntroScaling, freddypharkasPatchIntroScaling }, - { true, 200, "Mac: skip broken hop singh scene", 1, freddypharkasSignatureMacHopSingh, freddypharkasPatchMacHopSingh }, + { false, 200, "Mac: skip broken hop singh scene", 1, freddypharkasSignatureMacHopSingh, freddypharkasPatchMacHopSingh }, { true, 235, "CD: canister pickup hang", 3, freddypharkasSignatureCanisterHang, freddypharkasPatchCanisterHang }, { true, 270, "Mac: easter egg hang", 1, freddypharkasSignatureMacEasterEgg, freddypharkasPatchMacEasterEgg }, { true, 320, "ladder event issue", 2, freddypharkasSignatureLadderEvent, freddypharkasPatchLadderEvent }, @@ -13841,6 +13841,11 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) { // Do additional game-specific initialization switch (gameId) { + case GID_FREDDYPHARKAS: + if (_isMacSci11 && !g_sci->getResMan()->testResource(ResourceId(kResourceTypeView, 844))) { + enablePatch(signatureTable, "Mac: skip broken hop singh scene"); + } + break; case GID_KQ5: if (g_sci->_features->useAltWinGMSound()) { // See the explanation in the kq5SignatureWinGMSignals comment |