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

[dreammaster]

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:
e7d933bff7 M4: Fixes for talking to Vera in test 5
c39133674f M4: Fix deputy animation in room 137


Commit: e7d933bff7db08aeb333a81b931c9c9cea50749a
    https://github.com/scummvm/scummvm/commit/e7d933bff7db08aeb333a81b931c9c9cea50749a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-27T19:33:01-10:00

Commit Message:
M4: Fixes for talking to Vera in test 5

Changed paths:
    engines/m4/burger/rooms/section4/room405.cpp


diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index 5e3fbabe3ae..d89a37b9bd6 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -1264,6 +1264,9 @@ void Room405::conv92() {
 			} else {
 				_veraShould = 4;
 			}
+
+			conv_resume();
+
 		} else if (who == 1) {
 			sendWSMessage(0x150000, 0, _G(my_walker), 0, nullptr, 1);
 			conv_resume();


Commit: c39133674f41eef0c923e6a6b57103e1bf9b7a8a
    https://github.com/scummvm/scummvm/commit/c39133674f41eef0c923e6a6b57103e1bf9b7a8a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-27T19:51:36-10:00

Commit Message:
M4: Fix deputy animation in room 137

Changed paths:
    engines/m4/burger/rooms/section1/room137.cpp


diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index 84a6fda1a7e..732ce6f4eb7 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -437,7 +437,7 @@ void Room137::daemon() {
 	case 5:
 		unloadAssets();
 
-		if (_G(flags)[kPoliceState] != 2 && _G(flags)[kPoliceState] != 3 && _G(flags)[kPoliceState] == 4)
+		if (_G(flags)[kPoliceState] != 2 && _G(flags)[kPoliceState] != 3 && _G(flags)[kPoliceState] != 4)
 			_deputyShould = 30;
 
 		_sherrifMode = 5;