libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCUMM: Apply the Jolly Roger workaround to MONKEY1-VGA too

Browse Source 
It looks like my French floppy VGA release doesn't have that fix,
although the English floppy VGA release from the LRG Anthology has it!

So it just feels safer to enable this workaround for all Monkey 1
releases (except for the Ultimate Talkie Edition). If the same fix is
already in this script, it shouldn't hurt.
This commit is contained in:
Donovan Watteau 2022-08-13 19:51:43 +02:00 committed by Filippos Karapetis
parent 659df7bc01
commit 255f87dffa
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/scumm/script_v5.cpp
View File

@ -439,14 +439,16 @@ void ScummEngine_v5::o5_actorOps() {
// WORKAROUND: There's a continuity error in Monkey 1, in that the Jolly Roger should
// only appear in the first scene showing the Sea Monkey in the middle of the sea,
// since Guybrush must have picked it for the two other cutscenes to happen.
// since Guybrush must have picked it for the two other ship cutscenes to happen.
//
// The VGA releases fixed this, but this has been lost in the v5 versions. We just
// check that the script describing that "the crew begins to plan their voyage" is
// running, as that release did. The Ultimate Talkie fixed this, but differently.
if ((_game.id == GID_MONKEY_EGA || _game.id == GID_MONKEY) && _roomResource == 87 &&
vm.slot[_currentScript].number == 10002 && act == 9 && _enableEnhancements &&
strcmp(_game.variant, "SE Talkie") != 0) {
// Some official releases appear to have a fix for this (e.g. the English floppy VGA
// version), but most releases don't. The fixed release would check whether the
// script describing that "the crew begins to plan their voyage" is running in order
// to display the flag, so we just reuse this check. The Ultimate Talkie also fixed
// this, but in a different way which doesn't look as portable between releases.
if ((_game.id == GID_MONKEY_EGA || _game.id == GID_MONKEY_VGA || _game.id == GID_MONKEY) &&
_roomResource == 87 && vm.slot[_currentScript].number == 10002 && act == 9 &&
_enableEnhancements && strcmp(_game.variant, "SE Talkie") != 0) {
const int scriptNr = (_game.version == 5) ? 122 : 119;
if (!isScriptRunning(scriptNr)) {
a->putActor(0);