[Scummvm-git-logs] scummvm master -> 7ceb99d982caa3915d61f2f412ca62960965797d

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ceb99d982 SCI32: Exclude script patch when SCI32 is disabled


Commit: 7ceb99d982caa3915d61f2f412ca62960965797d
    https://github.com/scummvm/scummvm/commit/7ceb99d982caa3915d61f2f412ca62960965797d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-08-10T21:46:46-05:00

Commit Message:
SCI32: Exclude script patch when SCI32 is disabled

Fixes compiler warning

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 49e78a92b1..5583c57a09 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -571,6 +571,7 @@ static const uint16 sciNarratorLockupPatch[] = {
 	PATCH_END
 };
 
+#ifdef ENABLE_SCI32
 // Same signature/patch as above but for SCI32 games with debug line instructions.
 //  Some games use both because different versions were compiled differently.
 static const uint16 sciNarratorLockupLineSignature[] = {
@@ -592,6 +593,7 @@ static const uint16 sciNarratorLockupLinePatch[] = {
 	0x31, 0xfb,                         // bnt fb [ set ticks to 0 if ticks == -1 ]
 	PATCH_END
 };
+#endif
 
 // ECO1 CD and SQ4 CD share an early Narrator:say variant
 static const uint16 ecoquest1Sq4CdNarratorLockupSignature[] = {