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

[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:
ec5ed17f50 M4: Fix hang talking to Harry the barber


Commit: ec5ed17f5080c7064e0384553d875782e9722a59
    https://github.com/scummvm/scummvm/commit/ec5ed17f5080c7064e0384553d875782e9722a59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-28T20:14:59-08:00

Commit Message:
M4: Fix hang talking to Harry the barber

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


diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index b21e46f5b29..f35aa450065 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -185,6 +185,8 @@ void Room102::daemon() {
 		break;
 
 	case kCHANGE_HARRY_ANIMATION:
+		warning("%d - %d", _harryMode, _harryShould);
+
 		switch (_harryShould) {
 		case 19:
 			term_message(" mumble or change channel");
@@ -1508,6 +1510,8 @@ void Room102::conv04() {
 				kernel_trigger_dispatch_now(kCHANGE_HARRY_ANIMATION);
 				player_update_info();
 				ws_walk(192, 327, 0, -1, 4);
+				conv_resume_curr();
+
 			} else if (node == 4 && entry == 0) {
 				digi_preload("102_030");
 				digi_preload("102_031");
@@ -1697,7 +1701,6 @@ void Room102::conv06() {
 	}
 }
 
-
 } // namespace Rooms
 } // namespace Burger
 } // namespace M4