[Scummvm-cvs-logs] scummvm master -> b0defeed4d10e79a61c7c30480f6c0a83d4c4bd0

[bluegr]

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

Summary:
d603fe32e4 SCI: fix definition of GK1 police-sleep patch
b0defeed4d Merge pull request #564 from mcb30/gk1fix


Commit: d603fe32e4b94f6b5c9382eaf6725664b9d68a95
    https://github.com/scummvm/scummvm/commit/d603fe32e4b94f6b5c9382eaf6725664b9d68a95
Author: Michael Brown (mbrown at fensystems.co.uk)
Date: 2015-01-11T21:14:36Z

Commit Message:
SCI: fix definition of GK1 police-sleep patch

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 03cd1d0..c2a0b8b 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -562,12 +562,12 @@ static const uint16 gk1SignatureDay6PoliceSleep[] = {
 	0x34, SIG_UINT16(0x00dc),           // ldi 220
 	0x65, SIG_ADDTOOFFSET(+1),          // aTop cycles (1a for PC, 1c for Mac)
 	0x32,                               // jmp [end]
-	0
+	SIG_END
 };
 
 static const uint16 gk1PatchDay6PoliceSleep[] = {
 	PATCH_ADDTOOFFSET(+5),
-	0x34, SIG_UINT16(0x002a),           // ldi 42
+	0x34, PATCH_UINT16(0x002a),         // ldi 42
 	0x65, PATCH_GETORIGINALBYTEADJUST(+9, +2), // aTop seconds (1c for PC, 1e for Mac)
 	PATCH_END
 };


Commit: b0defeed4d10e79a61c7c30480f6c0a83d4c4bd0
    https://github.com/scummvm/scummvm/commit/b0defeed4d10e79a61c7c30480f6c0a83d4c4bd0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-11T23:30:11+02:00

Commit Message:
Merge pull request #564 from mcb30/gk1fix

SCI: fix definition of GK1 police-sleep patch

Changed paths:
    engines/sci/engine/script_patches.cpp