[Scummvm-git-logs] scummvm master -> 4f61f5af6d5384139c6aa35a6709c025a9d2aaa4

[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:
4f61f5af6d M4: Fix for barber conversation


Commit: 4f61f5af6d5384139c6aa35a6709c025a9d2aaa4
    https://github.com/scummvm/scummvm/commit/4f61f5af6d5384139c6aa35a6709c025a9d2aaa4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-23T21:54:04-08:00

Commit Message:
M4: Fix for barber conversation

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


diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index 2fcfff33892..55c5404fa95 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -185,8 +185,6 @@ void Room102::daemon() {
 		break;
 
 	case kCHANGE_HARRY_ANIMATION:
-		warning("%d - %d", _harryMode, _harryShould);
-
 		switch (_harryShould) {
 		case 19:
 			term_message(" mumble or change channel");
@@ -1629,7 +1627,7 @@ void Room102::conv06() {
 		if (who <= 0) {
 			if (node == 2) {
 				_harryMode = 19;
-				_G(kernel).trigger_mode = KT_PARSE;
+				_G(kernel).trigger_mode = KT_DAEMON;
 				kernel_trigger_dispatch_now(kCHANGE_HARRY_ANIMATION);
 			} else if (node == 1 && entry == 4) {
 				_G(flags)[V014] = 1;
@@ -1664,6 +1662,8 @@ void Room102::conv06() {
 				term_message("gonna_say_sheepdog %d %d", _harryShould, _harryMode);
 				queuePlay(sound, 22, KT_PARSE);
 				_flag1 = true;
+				return;
+
 			} else if (node == 1 && entry == 1) {
 				_G(flags)[GLB_TEMP_4] = 1;
 				_G(flags)[V001] -= 8;
@@ -1686,6 +1686,8 @@ void Room102::conv06() {
 		} else if (who == 1) {
 			if (_wilburChairMode == 64) {
 				kernel_timing_trigger(30, 7);
+				return;
+
 			} else {
 				_wilburChairShould = 60;
 				_G(kernel).trigger_mode = KT_DAEMON;
diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index 49ae05296c9..31fc98da4a7 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -423,7 +423,6 @@ void Room405::daemon() {
 		break;
 
 	case kCHANGE_VERA_ANIMATION:
-		warning("%d %d", _veraMode, _veraShould);
 		switch (_veraMode) {
 		case 4:
 			switch (_veraShould) {