[Scummvm-git-logs] scummvm master -> 18d915f4d7cb9c67a2ae3117c911eefba3e66813

[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:
18d915f4d7 M4: Fix waking police by talking to them


Commit: 18d915f4d7cb9c67a2ae3117c911eefba3e66813
    https://github.com/scummvm/scummvm/commit/18d915f4d7cb9c67a2ae3117c911eefba3e66813
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-23T19:20:39-10:00

Commit Message:
M4: Fix waking police by talking to them

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


diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index e96f0c6188a..ca1f0dc1c40 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -292,7 +292,7 @@ void Room138::daemon() {
 			case 35:
 				kernel_timing_trigger(120, 7);
 
-				if (inv_object_is_here("keys"))
+				if (!inv_object_is_here("keys"))
 					_G(flags)[kPoliceState] = 6;
 
 				_G(flags)[kPoliceCheckCtr] = 200;
@@ -556,6 +556,7 @@ void Room138::daemon() {
 		break;
 
 	case 6:
+		// Waking them up
 		_sherrifShould = 33;
 		_deputyShould = 23;
 		player_set_commands_allowed(false);
@@ -654,10 +655,10 @@ void Room138::parser() {
 		_wilburShould = 11;
 
 	} else if (player_said("talk to") &&
-			(player_said("sherrif") || player_said("deputy"))) {
+			(player_said("sheriff") || player_said("deputy"))) {
 		player_set_commands_allowed(false);
 		_G(flags)[kPoliceState] = 3;
-		wilbur_speech("138w610");
+		wilbur_speech("138w610", 6, 138);
 		_wilburShould = 15;
 
 	} else if (player_said("take", "keys") && !inv_player_has("keys")) {