[Scummvm-git-logs] scummvm branch-2-6 -> cee78c7f59b246b0c39620d7668f25fd517873bb

[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:
cee78c7f59 CHEWY: Fix getting ashtray in room 64


Commit: cee78c7f59b246b0c39620d7668f25fd517873bb
    https://github.com/scummvm/scummvm/commit/cee78c7f59b246b0c39620d7668f25fd517873bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-07-03T16:42:48-07:00

Commit Message:
CHEWY: Fix getting ashtray in room 64

Changed paths:
    engines/chewy/r_event.cpp
    engines/chewy/rooms/room64.cpp
    engines/chewy/types.h


diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index c956e1e974e..4c7d551c8b8 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -1123,6 +1123,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
 	case SIB_ASCHE_R64:
 		_G(det)->stop_detail(0);
 		_G(obj)->hide_sib(sib_nr);
+		_G(gameState).R64AshtrayTaken = true;
 		Room64::talk_man(351);
 		break;
 
diff --git a/engines/chewy/rooms/room64.cpp b/engines/chewy/rooms/room64.cpp
index 30b97e3ddbe..de1c2d7b130 100644
--- a/engines/chewy/rooms/room64.cpp
+++ b/engines/chewy/rooms/room64.cpp
@@ -34,7 +34,7 @@ void Room64::entry() {
 	_G(r62Delay) = 0;
 	_G(r64TalkAni) = _G(gameState).R64Moni1Ani;
 
-	if (_G(gameState).flags38_1)
+	if (!_G(gameState).R64AshtrayTaken)
 		_G(det)->startDetail(0, 255, false);
 	
 	if (!_G(gameState).R64ManWeg) {
diff --git a/engines/chewy/types.h b/engines/chewy/types.h
index 8d2fa0f8855..69d6d7c7be9 100644
--- a/engines/chewy/types.h
+++ b/engines/chewy/types.h
@@ -366,7 +366,7 @@ struct GameFlags {
 	bool flags37_40 : 1;
 	bool flags37_80 : 1;
 
-	bool flags38_1 : 1;
+	bool R64AshtrayTaken : 1;
 	bool flags38_2 : 1;
 	uint8 flags38_unused : 6;