[Scummvm-git-logs] scummvm master -> 53509390aceca60ec9e17b67b0738214cff9cb3a

[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:
53509390ac M4: RIDDLE: Move sendWSMessage_3840000 and sendWSMessage_3860000 to triggers.h/cpp, remove the variant without a machine


Commit: 53509390aceca60ec9e17b67b0738214cff9cb3a
    https://github.com/scummvm/scummvm/commit/53509390aceca60ec9e17b67b0738214cff9cb3a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-23T06:40:10+01:00

Commit Message:
M4: RIDDLE: Move sendWSMessage_3840000 and sendWSMessage_3860000 to triggers.h/cpp, remove the variant without a machine parameter

Changed paths:
    engines/m4/riddle/rooms/section8/room808.cpp
    engines/m4/riddle/rooms/section8/room810.cpp
    engines/m4/riddle/rooms/section8/room810.h
    engines/m4/riddle/rooms/section8/section8_room.cpp
    engines/m4/riddle/rooms/section8/section8_room.h
    engines/m4/riddle/triggers.cpp
    engines/m4/riddle/triggers.h


diff --git a/engines/m4/riddle/rooms/section8/room808.cpp b/engines/m4/riddle/rooms/section8/room808.cpp
index ec0c830afc5..03c5f6b4a1b 100644
--- a/engines/m4/riddle/rooms/section8/room808.cpp
+++ b/engines/m4/riddle/rooms/section8/room808.cpp
@@ -1079,7 +1079,7 @@ void Room808::parser() {
 				} else if (_G(flags)[V097] == 0) {
 					player_set_commands_allowed(false);
 					setGlobals3(_rptmr15Series, 1, 16);
-					sendWSMessage_3840000(-1);
+					sendWSMessage_3840000(_G(my_walker), -1);
 					setGlobals3(_meiChenHandsBehindBackSeries, 17, 1);
 					sendWSMessage_3840000(_mcTrekMach, 7);
 				} else if (_G(flags)[V097] == 1) {
diff --git a/engines/m4/riddle/rooms/section8/room810.cpp b/engines/m4/riddle/rooms/section8/room810.cpp
index 2b3c129f58e..9a77f9e3a81 100644
--- a/engines/m4/riddle/rooms/section8/room810.cpp
+++ b/engines/m4/riddle/rooms/section8/room810.cpp
@@ -300,10 +300,6 @@ void Room810::daemon() {
 	}
 }
 
-void Room810::sendWSMessage_3860000(machine *mach, int32 val1) {
-	_G(globals[GLB_TEMP_1]) = kernel_trigger_create(val1);
-	sendWSMessage(ACTION_902 << 16, 0, mach, 0, nullptr, 1);
-}
 } // namespace Rooms
 } // namespace Riddle
 } // namespace M4
diff --git a/engines/m4/riddle/rooms/section8/room810.h b/engines/m4/riddle/rooms/section8/room810.h
index 9f0fbfbc00e..0d57cd606cf 100644
--- a/engines/m4/riddle/rooms/section8/room810.h
+++ b/engines/m4/riddle/rooms/section8/room810.h
@@ -40,8 +40,6 @@ public:
 	void daemon() override;
 
 private:
-	void sendWSMessage_3860000(machine *mach, int32 val1);
-
 	bool _alreadyPlayedVideo04aFl = false;
 
 	int32 _810BlockSlidesOutSeries = 0;
diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index b0c509f8114..f339577be94 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -47,19 +47,6 @@ int32 Section8Room::getStatueIndex(int32 val1) {
 	return -1;
 }
 
-void Section8Room::sendWSMessage_3840000(int32 trigger) {
-	sendWSMessage_3840000(_G(my_walker), trigger);
-}
-
-void Section8Room::sendWSMessage_3840000(machine *machine, int32 trigger) {
-	int32 num = trigger;
-	if (trigger == 0)
-		num = -1;
-
-	_G(globals[GLB_TEMP_4]) = kernel_trigger_create(num);
-	sendWSMessage(ACTION_900 << 16, 0, machine, 0, nullptr, 1);
-}
-
 int32 Section8Room::subCE52E(int32 val1) {
 	if (_currentRoom == 844 && val1 == 1 && _G(flags)[V271] != 0)
 		return 3;
diff --git a/engines/m4/riddle/rooms/section8/section8_room.h b/engines/m4/riddle/rooms/section8/section8_room.h
index cd3a0ef2b74..3f51189094e 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.h
+++ b/engines/m4/riddle/rooms/section8/section8_room.h
@@ -87,8 +87,6 @@ protected:
 	machine *_ripPushMach = nullptr;
 
 	int32 getStatueIndex(int32 val1);
-	void sendWSMessage_3840000(int32 trigger);
-	void sendWSMessage_3840000(machine *machine, int32 trigger);
 	int32 subCE52E(int32 val1);
 	void moveScreen(int32 dx, int32 dy);
 	void getSeriesName(int32 val1, bool true_or_False);
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 99f94e0a806..8459ba4fad0 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -304,6 +304,20 @@ void sendWSMessage_29a0000(int val1) {
 	sendWSMessage_29a0000(_G(my_walker), val1);
 }
 
+void sendWSMessage_3840000(machine *machine, int32 trigger) {
+	int32 num = trigger;
+	if (trigger == 0)
+		num = -1;
+
+	_G(globals[GLB_TEMP_4]) = kernel_trigger_create(num);
+	sendWSMessage(ACTION_900 << 16, 0, machine, 0, nullptr, 1);
+}
+
+void sendWSMessage_3860000(machine *mach, int32 trigger) {
+	_G(globals[GLB_TEMP_1]) = kernel_trigger_create(trigger);
+	sendWSMessage(ACTION_902 << 16, 0, mach, 0, nullptr, 1);
+}
+
 void intrMsgNull(frac16 myMessage, machine *sender) {
 }
 
diff --git a/engines/m4/riddle/triggers.h b/engines/m4/riddle/triggers.h
index 5ef7ad18949..6712e7140d1 100644
--- a/engines/m4/riddle/triggers.h
+++ b/engines/m4/riddle/triggers.h
@@ -81,6 +81,10 @@ extern void sendWSMessage_210000(machine *recv, int trigger);
 extern void sendWSMessage_29a0000(machine *recv, int val1);
 extern void sendWSMessage_29a0000(int val1);
 
+// Specific to room section 8
+extern void sendWSMessage_3840000(machine *mach, int32 val1);
+extern void sendWSMessage_3860000(machine *mach, int32 trigger);
+
 extern void intrMsgNull(frac16 myMessage, machine *sender);
 extern void triggerMachineByHashCallback(frac16 myMessage, machine *sender = nullptr);
 extern void triggerMachineByHashCallback3000(frac16 myMessage, machine *sender = nullptr);