[Scummvm-git-logs] scummvm master -> c3b71a91716e60370616eb98068df0a8918ba9e7

[bluegr]

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:
c3b71a9171 SCI: Update QFG1VGA speed test patch for Mac


Commit: c3b71a91716e60370616eb98068df0a8918ba9e7
    https://github.com/scummvm/scummvm/commit/c3b71a91716e60370616eb98068df0a8918ba9e7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-04-20T15:51:27+03:00

Commit Message:
SCI: Update QFG1VGA speed test patch for Mac

Updates the speed test patch to work with the newer and significantly
different Mac version

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 792a5dd..b228553 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -7872,24 +7872,27 @@ static const uint16 qfg1vgaPatchBrutusScriptFreeze[] = {
 	PATCH_END
 };
 
-// Speed up the speed test by a factor 50, ensuring the detected speed
-// will end up at the highest level. This improves the detail in
-// Yorick's room (96), and slightly changes the timing in other rooms.
+// Patch the speed test so that it always ends up at the highest level. This
+//  improves the detail in Yorick's room (96), and slightly changes the timing
+//  in other rooms. This is compatible with PC and Mac versions which use
+//  significantly different tests and calculations.
 //
-// Method changed: speedTest::changeState
+// Applies to: PC Floppy, Mac Floppy
+// Responsible method: speedTest:changeState(2)
 static const uint16 qfg1vgaSignatureSpeedTest[] = {
 	0x76,                               // push0
 	0x43, 0x42, 0x00,                   // callk GetTime, 0
 	SIG_MAGICDWORD,
-	0xa3, 0x01,                         // sal local[1]
-	0x35, 0x32,                         // ldi 50
-	0x65, 0x1a,                         // aTop cycles
+	0x36,                               // push
+	0x83, 0x01,                         // lal 01
+	0x04,                               // sub
+	0xa3, 0x00,                         // sal 00
 	SIG_END
 };
 
 static const uint16 qfg1vgaPatchSpeedTest[] = {
-	PATCH_ADDTOOFFSET(+6),
-	0x35, 0x01,                         // ldi 1
+	0x35, 0x00,                         // ldi 00 [ local0 = 0, the best result ]
+	0x33, 0x04,                         // jmp 04
 	PATCH_END
 };