[Scummvm-git-logs] scummvm branch-2-6 -> 8e1813ae0961223ad571182482944232859e7653

[dreammaster]

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:
8e1813ae09 CHEWY: Fix loading savegames for combination lock closeup


Commit: 8e1813ae0961223ad571182482944232859e7653
    https://github.com/scummvm/scummvm/commit/8e1813ae0961223ad571182482944232859e7653
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-07-03T19:14:57-07:00

Commit Message:
CHEWY: Fix loading savegames for combination lock closeup

Changed paths:
    engines/chewy/chewy.cpp


diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp
index 89bc197e8ad..00d125059eb 100644
--- a/engines/chewy/chewy.cpp
+++ b/engines/chewy/chewy.cpp
@@ -134,6 +134,13 @@ Common::Error ChewyEngine::loadGameStream(Common::SeekableReadStream *stream) {
 			setPersonPos(_G(gameState).X[i], _G(gameState).Y[i], i, _G(gameState).Phase[i]);
 		}
 
+		// WORKAROUND: The original doesn't allow saving in room 47
+		// (combination lock close-up). This workaround fixes loading
+		if (_G(gameState)._personRoomNr[P_CHEWY] == 47) {
+			_G(gameState)._personHide[P_CHEWY] = false;
+			_G(gameState)._personHide[P_HOWARD] = false;
+		}
+
 		_G(auto_obj) = 0;
 
 		enter_room(-1);