[Scummvm-git-logs] scummvm branch-2-1 -> 41a0b3c497dbeccfb28357e626cee6e6da779629
bluegr
bluegr at gmail.com
Sun Sep 29 23:08:33 CEST 2019
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:
b449727aae SCI32: Fix typo in kGlobalVarHoyle5ResponseTime
41a0b3c497 SCI32/SCI: Sync Hoyle 4 and Hoyle 5 Bridge workarounds
Commit: b449727aae1f3ed1d73ab4306d80fbb3d18a098e
https://github.com/scummvm/scummvm/commit/b449727aae1f3ed1d73ab4306d80fbb3d18a098e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2019-09-30T00:08:00+03:00
Commit Message:
SCI32: Fix typo in kGlobalVarHoyle5ResponseTime
Changed paths:
engines/sci/engine/guest_additions.cpp
engines/sci/engine/vm.h
diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index 581cbbf..8cf8c05 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -168,7 +168,7 @@ void GuestAdditions::writeVarHook(const int type, const int index, const reg_t v
syncGK1StartupVolumeFromScummVM(index, value);
} else if (g_sci->getGameId() == GID_HOYLE5 && index == kGlobalVarHoyle5MusicVolume) {
syncHoyle5VolumeFromScummVM((ConfMan.getInt("music_volume") + 1) * kHoyle5VolumeMax / Audio::Mixer::kMaxMixerVolume);
- } else if (g_sci->getGameId() == GID_HOYLE5 && index == kkGlobalVarHoyle5ResponseTime && value.getOffset() == 0) {
+ } else if (g_sci->getGameId() == GID_HOYLE5 && index == kGlobalVarHoyle5ResponseTime && value.getOffset() == 0) {
// WORKAROUND: Global 899 contains the response time value,
// which may have values between 1 and 15. There is a script
// bug when loading values from game.opt, where this variable
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index f6a4077..c800704 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -180,7 +180,7 @@ enum GlobalVar {
kGlobalVarShivers1Score = 349,
kGlobalVarQFG4Flags = 500,
kGlobalVarHoyle5MusicVolume = 897,
- kkGlobalVarHoyle5ResponseTime = 899
+ kGlobalVarHoyle5ResponseTime = 899
};
/** Number of kernel calls in between gcs; should be < 50000 */
Commit: 41a0b3c497dbeccfb28357e626cee6e6da779629
https://github.com/scummvm/scummvm/commit/41a0b3c497dbeccfb28357e626cee6e6da779629
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2019-09-30T00:08:01+03:00
Commit Message:
SCI32/SCI: Sync Hoyle 4 and Hoyle 5 Bridge workarounds
These two games use the same scripts for the Bridge sub-game, so their
workarounds are the same. Fixes bugs #11162, #11183
Changed paths:
engines/sci/engine/workarounds.cpp
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index caf7e59..a2e8504 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -385,11 +385,11 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
{ GID_HOYLE4, 910, 910, 0, NULL, "setup", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // when selecting "Tutorial" from the main menu - bug #5132
{ GID_HOYLE4, 700, 700, 1, "BridgeHand", "calcQTS", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // when placing a bid in bridge (always)
{ GID_HOYLE4, 700, 710, 1, "BridgeStrategyPlay", "checkSplitTops", NULL, 10, 10, { WORKAROUND_FAKE, 0 } }, // while playing bridge, objects LeadReturn_Trump, SecondSeat_Trump, ThirdSeat_Trump and others - bug #5794
- { GID_HOYLE4, 700, -1, 1, "BridgeDefense", "think", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
{ GID_HOYLE4, 700, 730, 1, "BridgeDefense", "beatTheirBest", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // rarely while playing bridge
+ { GID_HOYLE4, 700, -1, 1, "BridgeDefense", "makeContractMinusAce", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11162
+ { GID_HOYLE4, 700, -1, 1, "BridgeDefense", "think", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // sometimes while playing bridge, temp var 3, 17 and others, objects LeadReturn_Trump, ThirdSeat_Trump and others
{ GID_HOYLE4, 700, -1, 1, "Code", "doit", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // when placing a bid in bridge (always), temp var 11, 24, 27, 46, 75, objects compete_tree, compwe_tree, other1_tree, b1 - bugs #5663 and #5794
- { GID_HOYLE4, 700, 921, 0, "Print", "addEdit", NULL, 0, 0, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
- { GID_HOYLE4, 700, 921, 0, "Print", "addEdit", NULL, 1, 1, { WORKAROUND_FAKE, 1 } }, // see above, Text-control saves its coordinates to temp[0] and temp[1], Edit-control adjusts to those uninitialized temps, who by accident were left over from the Text-control
+ { GID_HOYLE4, 700, 921, 0, "Print", "addEdit", NULL, -1, -1, { WORKAROUND_FAKE, 118 } }, // when saving the game (may also occur in other situations) - bug #6601, bug #6614
{ GID_HOYLE4, 300, 300, 0, "", "export 2", sig_uninitread_hoyle4_1, 0, 0, { WORKAROUND_FAKE, 0 } }, // after passing around cards in hearts
{ GID_HOYLE4, 400, 400, 1, "GinHand", "calcRuns", NULL, 4, 4, { WORKAROUND_FAKE, 0 } }, // sometimes while playing Gin Rummy (e.g. when knocking and placing a card) - bug #5665
{ GID_HOYLE4, 500, 17, 1, "Character", "say", NULL, 504, 504, { WORKAROUND_FAKE, 0 } }, // sometimes while playing Cribbage (e.g. when the opponent says "Last Card") - bug #5662
@@ -401,16 +401,13 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
{ GID_HOYLE5, 300, 300, 0, "", "export 2", sig_uninitread_hoyle5_1, 0, 0, { WORKAROUND_FAKE, 0 } }, // after passing around cards in hearts
{ GID_HOYLE5, 400, 400, 1, "GinHand", "calcRuns", NULL, 4, 4, { WORKAROUND_FAKE, 0 } }, // when starting Gin
{ GID_HOYLE5, 700, 700, 1, "BridgeHand", "calcQTS", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // when an opponent is playing in Bridge
- { GID_HOYLE5, 700, 747, 0, "LeadReturn_Trump", "think", NULL, 17, 17, { WORKAROUND_FAKE, 0 } }, // when an opponent is playing in Bridge
- { GID_HOYLE5, 700, 1115, 0, NULL, "select", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // when adjusting the attitude slider in Bridge - bug #11166
{ GID_HOYLE5, 700, 710, 1, "BridgeStrategyPlay", "checkSplitTops", NULL, 10, 10, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11167
- { GID_HOYLE5, 700, 713, 0, "n2_tree", "doit", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11169
- { GID_HOYLE5, 700, 715, 0, "c2_tree", "doit", NULL, 21, 21, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11170
- { GID_HOYLE5, 700, 716, 0, "other1_tree", "doit", NULL, 10, 10, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11168
- { GID_HOYLE5, 700, 716, 0, "other1_tree", "doit", NULL, 69, 69, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11168
{ GID_HOYLE5, 700, 730, 1, "BridgeDefense", "beatTheirBest", NULL, 3, 3, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11171
- { GID_HOYLE5, 700, 752, 0, "LeadReturn_NoTrump", "makeContractMinusAce", NULL, 2, 2, { WORKAROUND_FAKE, 0 } }, // when playing Bridge - bug #11172
+ { GID_HOYLE5, 700, -1, 1, "BridgeDefense", "makeContractMinusAce", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // when playing Bridge
+ { GID_HOYLE5, 700, -1, 1, "BridgeDefense", "think", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // when an opponent is playing in Bridge, objects LeadSeat_NoTrump and others
+ { GID_HOYLE5, 700, -1, 1, "Code", "doit", NULL, -1, -1, { WORKAROUND_FAKE, 0 } }, // when placing a bid in Bridge, objects c2_tree, other1_tree, compwe_tree - bugs #11168, #11169, #11170, #11183
{ GID_HOYLE5, 700, 753, 0, "LeadSeat_NoTrump", "think", sig_uninitread_hoyle5_5, 4, 4, { WORKAROUND_FAKE, 0 } }, // when playing Bridge
+ { GID_HOYLE5, 700, 1115, 0, NULL, "select", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // when adjusting the attitude slider in Bridge - bug #11166
{ GID_HOYLE5, 1100, 18, 0, "Tray", "init", NULL, 0, 0, { WORKAROUND_FAKE, 0 } }, // when playing Poker
{ GID_HOYLE5, 1100, 1100, 0, "anteButton", "handleEvent", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // when exiting Poker
{ GID_HOYLE5, 6029, 6029, 1, "ControlIcon", "select", NULL, 1, 1, { WORKAROUND_FAKE, 0 } }, // Solitaire: when changing any slider in the Card Flip mini-game's options window
More information about the Scummvm-git-logs
mailing list