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

[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:
c0320423d1 CHEWY: Fix room placement of Nichelle after Kong attack - bug #13690
a781fc7374 NEWS: Add another fix for Chewy


Commit: c0320423d1c8a1e74d451afed2b4f4758186aca1
    https://github.com/scummvm/scummvm/commit/c0320423d1c8a1e74d451afed2b4f4758186aca1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T01:23:27+02:00

Commit Message:
CHEWY: Fix room placement of Nichelle after Kong attack - bug #13690

Changed paths:
    engines/chewy/rooms/room88.cpp


diff --git a/engines/chewy/rooms/room88.cpp b/engines/chewy/rooms/room88.cpp
index fe88d6d200e..837c23075c9 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -49,7 +49,9 @@ void Room88::entry() {
 void Room88::xit() {
 	_G(gameState).flags31_8 = true;
 	_G(gameState)._personRoomNr[P_HOWARD] = _G(gameState).R88UsedMonkey ? 84 : 82;
-	_G(gameState)._personRoomNr[P_NICHELLE] = _G(gameState)._personRoomNr[P_HOWARD];
+	// Don't move Nichelle if she has been abducted in room 86
+	if (_G(gameState)._personRoomNr[P_NICHELLE] != 0)
+		_G(gameState)._personRoomNr[P_NICHELLE] = _G(gameState)._personRoomNr[P_HOWARD];
 }
 
 int Room88::proc1() {


Commit: a781fc7374a62875defbb8346c065be1499d1747
    https://github.com/scummvm/scummvm/commit/a781fc7374a62875defbb8346c065be1499d1747
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T01:23:28+02:00

Commit Message:
NEWS: Add another fix for Chewy

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index f5901794d5c..87c0201637e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -65,6 +65,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed unlocked cutscenes in cinema screen.
    - Fixed music in harbor during the second visit.
    - Fixed movement of Chewy's boat during the boat race.
+   - Fixed room placement of Nichelle after Kong attack.
 
  Cine:
    - Added keymapper support.