[Scummvm-git-logs] scummvm master -> 6e9c213bfa97095fba21a2a56d7916a71b732f19

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6e9c213bfa M4: RIDDLE: Fix nasty rare crash & graphic corruption in room 806


Commit: 6e9c213bfa97095fba21a2a56d7916a71b732f19
    https://github.com/scummvm/scummvm/commit/6e9c213bfa97095fba21a2a56d7916a71b732f19
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-23T23:36:19+01:00

Commit Message:
M4: RIDDLE: Fix nasty rare crash & graphic corruption in room 806

Changed paths:
    engines/m4/riddle/rooms/section8/room806.cpp
    engines/m4/riddle/rooms/section8/room806.h


diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 5799263fedb..03e545c7a44 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -1112,6 +1112,7 @@ void Room806::parser() {
 }
 
 void Room806::daemon() {
+	warning("Trigger %d", _G(kernel).trigger);
 	switch (_G(kernel).trigger) {
 	case 101:
 		ws_hide_walker(_mcTrekMach);
@@ -1529,7 +1530,7 @@ void Room806::daemon() {
 
 	case 701:
 		if (!_unkVar2 && !_unkVar1) {
-			setGlobals1(_unkSeries1, 1, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_meiTrekHandsOnHipsPos3Series, 1, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 			sendWSMessage_110000(_mcTrekMach, 703);
 			_unkVar2 = 1;
 		}
diff --git a/engines/m4/riddle/rooms/section8/room806.h b/engines/m4/riddle/rooms/section8/room806.h
index 9fdf20f745e..7587d1e35e3 100644
--- a/engines/m4/riddle/rooms/section8/room806.h
+++ b/engines/m4/riddle/rooms/section8/room806.h
@@ -40,8 +40,6 @@ public:
 	void daemon() override;
 
 private:
-	int32 _unkSeries1 = 0;
-
 	int32 _unkVar1 = 0;
 	int32 _unkVar2 = 0;
 	int32 _unkVar3 = 0;