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

[dwatteau]

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:
fb17cf427c SCUMM: Make Indy3 Trac#2556 workaround an optional enhancement


Commit: fb17cf427cf8a08af3a25a3dac26d08d8d8421b1
    https://github.com/scummvm/scummvm/commit/fb17cf427cf8a08af3a25a3dac26d08d8d8421b1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-16T16:55:39+02:00

Commit Message:
SCUMM: Make Indy3 Trac#2556 workaround an optional enhancement

This enhancement could probably be improved if the original issue is
real, since the game really doesn't expect you to go back to the
front of the castle, but as I don't own the German release and can't
reproduce this bug from a normal gameplay on my other releases, I'd
rather only adjust the _enableEnhancements flag for now.

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index e219e1b92c8..d60cea924f6 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -398,7 +398,16 @@ void Actor_v3::setupActorScale() {
 	// To workaround this, we override the scale of Henry. Since V3 games
 	// like Indy3 don't use the costume scale otherwise, this works fine.
 	// The scale factor 0x50 was determined by some guess work.
-	if (_number == 2 && _costume == 7 && _vm->_game.id == GID_INDY3 && _vm->_currentRoom == 12) {
+	//
+	// TODO: I can't reproduce this with the EGA DOS, EGA Macintosh and
+	// VGA DOS English releases, since Indy says he'd "better not" go back
+	// to the front of the castle at this point (script 77-201), as long
+	// as a special Bit is set for this (and it's set in room 21 entry
+	// script when Henry escapes from his room). Maybe there's a problem
+	// in the German release (and then it'd probably be better to restore
+	// that safeguard instead, since the game clearly doesn't expect you
+	// to go back inside the castle), but I don't own this version.  -dwa
+	if (_number == 2 && _costume == 7 && _vm->_game.id == GID_INDY3 && _vm->_currentRoom == 12 && _vm->_enableEnhancements) {
 		_scalex = 0x50;
 		_scaley = 0x50;
 	} else {