[Scummvm-git-logs] scummvm master -> 07f208f59e570bb81d99433ff57418601ad36f20
bluegr
bluegr at gmail.com
Tue Oct 23 01:07:32 CEST 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3a8936ea5c SCI32: Fix a script bug (typo) in Hoyle 5 - Old Maid
e87d3c0e82 SCI32: Disable the Poker game in Hoyle 5
07f208f59e SCI32: Promote Hoyle 5 game variants to ADGF_TESTING
Commit: 3a8936ea5ca3fb2bc44d1179c883c1030a2bff39
https://github.com/scummvm/scummvm/commit/3a8936ea5ca3fb2bc44d1179c883c1030a2bff39
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-10-23T01:55:00+03:00
Commit Message:
SCI32: Fix a script bug (typo) in Hoyle 5 - Old Maid
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 97564b8..6244ef9 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -910,6 +910,25 @@ static const uint16 hoyle5PatchSpinLoop[] = {
PATCH_END
};
+// While playing Old Maid (room 200), a repeated typo in the game script
+// means that `setScale` is called accidentally instead of `setScaler`.
+// In SSCI this did not do much because the first argument happened to be
+// smaller than the y-position of `ego`, but in ScummVM the first argument is
+// larger and so a debug message "y value less than vanishingY" is displayed.
+// This is the same issue as with LSL6 hires.
+static const uint16 hoyle5SetScaleSignature[] = {
+ SIG_MAGICDWORD,
+ 0x38, SIG_SELECTOR16(setScale), // pushi $14b (setScale)
+ 0x38, SIG_UINT16(0x05), // pushi 5
+ 0x51, 0x2c, // class 2c (Scaler)
+ SIG_END
+};
+
+static const uint16 hoyle5PatchSetScale[] = {
+ 0x38, PATCH_SELECTOR16(setScaler), // pushi $14f (setScaler)
+ PATCH_END
+};
+
// There are two derived collections of Hoyle Classic Games:
// 1) The Hoyle Children's Collection, which includes the following games:
// - Crazy Eights (script 100)
@@ -1058,6 +1077,7 @@ static const uint16 hoyle5PatchDisableGame[] = {
static const SciScriptPatcherEntry hoyle5Signatures[] = {
{ true, 3, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 23, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
+ { true, 200, "fix setScale calls", 11, hoyle5SetScaleSignature, hoyle5PatchSetScale },
{ true, 500, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64937, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64908, "disable video benchmarking", 1, sci2BenchmarkSignature, sci2BenchmarkPatch },
@@ -1068,6 +1088,7 @@ static const SciScriptPatcherEntry hoyle5Signatures[] = {
static const SciScriptPatcherEntry hoyle5ChildrensCollectionSignatures[] = {
{ true, 3, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 23, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
+ { true, 200, "fix setScale calls", 11, hoyle5SetScaleSignature, hoyle5PatchSetScale },
{ true, 500, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64937, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64908, "disable video benchmarking", 1, sci2BenchmarkSignature, sci2BenchmarkPatch },
Commit: e87d3c0e82be6c8c956aa549d39a31b231916c93
https://github.com/scummvm/scummvm/commit/e87d3c0e82be6c8c956aa549d39a31b231916c93
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-10-23T02:03:14+03:00
Commit Message:
SCI32: Disable the Poker game in Hoyle 5
This game uses an external DLL, PENGIN16.DLL, which is invoked via
kWinDLL. We need to reverse the logic in PENGIN16.DLL and call it
directly, in order to get this game to work properly. Until then, this
game entry will be disabled.
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 6244ef9..7b46101 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1081,6 +1081,10 @@ static const SciScriptPatcherEntry hoyle5Signatures[] = {
{ true, 500, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64937, "remove kGetTime spin", 1, hoyle5SignatureSpinLoop, hoyle5PatchSpinLoop },
{ true, 64908, "disable video benchmarking", 1, sci2BenchmarkSignature, sci2BenchmarkPatch },
+ // This entry has been placed so that the broken Poker game is disabled. This game uses an external DLL, PENGIN16.DLL,
+ // which is invoked via kWinDLL. We need to reverse the logic in PENGIN16.DLL and call it directly, in order to get this
+ // game to work properly. Until then, this game entry will be disabled.
+ { true, 975, "disable Poker", 1, hoyle5SignaturePoker, hoyle5PatchDisableGame },
SCI_SIGNATUREENTRY_TERMINATOR
};
Commit: 07f208f59e570bb81d99433ff57418601ad36f20
https://github.com/scummvm/scummvm/commit/07f208f59e570bb81d99433ff57418601ad36f20
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-10-23T02:07:09+03:00
Commit Message:
SCI32: Promote Hoyle 5 game variants to ADGF_TESTING
Changed paths:
engines/sci/detection_tables.h
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 1933193..da24bf9 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1173,7 +1173,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "98a39ae535dd01714ac313f8ba925045", 7260363},
{"resmap.000", 0, "10267a1542a73d527e50f0340549088b", 4900},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle 5 (Hoyle Classic Games) - Windows
{"hoyle5", "", {
@@ -1181,7 +1181,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "55ae04012a73abc15b93debf60a7df71", 16909704},
{"resmap.000", 0, "daf64a91344a7934fe4374765267c2af", 5767},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle 5 (Hoyle Classic Games for Laptops) - Windows
// SCI 2.100.002
@@ -1190,7 +1190,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "ca50cf09f80a5f982a965afea852cc42", 3278849},
{"resmap.000", 0, "d5eef6f2529313e950c4d78251a95b1e", 4213},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle Bridge - Windows
{"hoyle5bridge", "", {
@@ -1198,7 +1198,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "b83cba09229d3003df9e0c864843f962", 16842499},
{"resmap.000", 0, "7b3e3030b0ad5f341053c18afce7d176", 5647},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle Children's Collection - Windows
{"hoyle5children", "", {
@@ -1206,7 +1206,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "fd1f7dbeebd4510cd37e171a72f2b6ad", 16824349},
{"resmap.000", 0, "b0fe1bcc69596e10fe5caa11d0b55b23", 5671},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle Solitaire (CD version) - Windows
{"hoyle5solitaire", "CD", {
@@ -1214,7 +1214,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "fa4eeb24b1fbf6f33739995360554485", 11628203},
{"resmap.000", 0, "3f63df73a49800f080775d2a9ad0e949", 3079},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
// Hoyle Solitaire (Hard Drive version) - Windows
{"hoyle5solitaire", "Hard Drive", {
@@ -1222,7 +1222,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{"ressci.000", 0, "da180c67d54d4208c84a48fcd8709671", 8582335},
{"resmap.000", 0, "e2feb47ab16f9e22a9b6a8580d1da3f0", 3055},
AD_LISTEND},
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSTABLE | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_DROPPLATFORM, GUIO_HOYLE5 },
#undef GUIO_HOYLE5
More information about the Scummvm-git-logs
mailing list