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

[Strangerke]

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:
ec58c9a118 M4: RIDDLE: Multiple fixes in dialog of room 301


Commit: ec58c9a118aec2b5b0bcf4f00ca6c6737cb0d232
    https://github.com/scummvm/scummvm/commit/ec58c9a118aec2b5b0bcf4f00ca6c6737cb0d232
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-24T09:16:34+01:00

Commit Message:
M4: RIDDLE: Multiple fixes in dialog of room 301

Changed paths:
    engines/m4/riddle/rooms/section3/room301.cpp


diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index ef934a5abbe..8786712a525 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -279,7 +279,7 @@ void Room301::daemon() {
 				if (val == 1) {
 					sendWSMessage_10000(1, _george, _agentStander, 7, 7, 10,
 						_agentStander, 7, 7, 0);
-				} else {
+				} else if (val == 2) {
 					sendWSMessage_10000(1, _george, _agentStander, 7, 1, 10,
 						_agentStander, 1, 1, 0);
 					_georgeShould = _georgeMode = 0;
@@ -377,12 +377,16 @@ void Room301::daemon() {
 			case 9:
 				sendWSMessage_10000(1, _george, _agentTalk, 6, 15, 10,
 					_agentTalk, 15, 15, 0);
+				_georgeShould = 8;
+				
 				break;
 
 			default:
 				sendWSMessage_10000(1, _george, _agentTalk, 6, 1, 10,
 					_agentStander, 1, 1, 0);
 				_georgeShould = 0;
+				_val8 = 0;
+				
 				break;
 			}
 			break;
@@ -393,6 +397,7 @@ void Room301::daemon() {
 				sendWSMessage_10000(1, _george, _agentTalk, 15, 15, 10,
 					_agentTalk, 15, 15, 0);
 				break;
+				
 			case 9:
 				if (_soundName) {
 					digi_play(_soundName, 1, 255, _val16);
@@ -401,11 +406,15 @@ void Room301::daemon() {
 
 				sendWSMessage_10000(1, _george, _agentTalk, 16, 32, 10,
 					_agentTalk, 15, 15, 0);
+				_georgeShould = 8;
+				
 				break;
 			default:
 				sendWSMessage_10000(1, _george, _agentTalk, 15, 6, 10,
 					_agentTalk, 6, 6, 0);
 				_georgeShould = 7;
+				_val8 = 0;
+				
 				break;
 			}
 			break;
@@ -668,6 +677,8 @@ void Room301::daemon() {
 	case 100:
 		sendWSMessage_10000(1, _george, _agentCheckingList, 8,
 			1, 10, _agentStander, 1, 1, 0);
+		_georgeShould = 0;
+		
 		break;
 
 	case 200: