[Scummvm-git-logs] scummvm master -> 3f7e12f3fc2837e3bc61d2db0ce3350df769235a

[bluegr]

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:
86b7ca64a2 SCUMM: Indy4 - Put coat/window in office, fixes bug #12420
3f7e12f3fc SCUMM: Fix comment


Commit: 86b7ca64a29619c9ea1e2a56db4ed46fb4a42593
    https://github.com/scummvm/scummvm/commit/86b7ca64a29619c9ea1e2a56db4ed46fb4a42593
Author: Ben Castricum (github at bencastricum.nl)
Date: 2021-08-30T19:21:36+03:00

Commit Message:
SCUMM: Indy4 - Put coat/window in office, fixes bug #12420

WORKAROUND bug #12420 (also occurs in original) Broken window and coat missing

This happens when you skip the cutscenes in the beginning, in particular
the one where Indy enters the office for the first time. If object 23 (National
Archeology) is in possession of Indy (owner == 1) then it's safe the force the
coat (object 24) and broken window (object 25) into the room to compensate for
the skipped code.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 0f95070027..a0e87efc41 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1383,6 +1383,16 @@ void ScummEngine_v5::o5_loadRoom() {
 
 	room = getVarOrDirectByte(PARAM_1);
 
+	// WORKAROUND bug #12420 (also occurs in original) Broken window and coat missing
+	// This happens when you skip the cutscenes in the beginning, in particular
+	// the one where Indy enters the office for the first time. If object 23 (National
+	// Archeology) is in possession of Indy (owner == 1) then it's safe the force the
+	// coat (object 24) and broken window (object 25) into the room.
+	if (_game.id == GID_INDY4 && room == 1 && _objectOwnerTable[23] == 1) {
+		putState(24, 1);
+		putState(25, 1);
+	}
+
 	// For small header games, we only call startScene if the room
 	// actually changed. This avoid unwanted (wrong) fades in Zak256
 	// and others. OTOH, it seems to cause a problem in newer games.


Commit: 3f7e12f3fc2837e3bc61d2db0ce3350df769235a
    https://github.com/scummvm/scummvm/commit/3f7e12f3fc2837e3bc61d2db0ce3350df769235a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-30T19:21:36+03:00

Commit Message:
SCUMM: Fix comment

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a0e87efc41..69504f8349 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1386,7 +1386,7 @@ void ScummEngine_v5::o5_loadRoom() {
 	// WORKAROUND bug #12420 (also occurs in original) Broken window and coat missing
 	// This happens when you skip the cutscenes in the beginning, in particular
 	// the one where Indy enters the office for the first time. If object 23 (National
-	// Archeology) is in possession of Indy (owner == 1) then it's safe the force the
+	// Archeology) is in possession of Indy (owner == 1) then it's safe to force the
 	// coat (object 24) and broken window (object 25) into the room.
 	if (_game.id == GID_INDY4 && room == 1 && _objectOwnerTable[23] == 1) {
 		putState(24, 1);