[Scummvm-git-logs] scummvm master -> 8d11c749e7d417938106ee71c591735cda92c98e

[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:
8d11c749e7 M4: RIDDLE: Name 'series' as the first parameter of the setGlobals methods


Commit: 8d11c749e7d417938106ee71c591735cda92c98e
    https://github.com/scummvm/scummvm/commit/8d11c749e7d417938106ee71c591735cda92c98e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-13T16:29:25-07:00

Commit Message:
M4: RIDDLE: Name 'series' as the first parameter of the setGlobals methods

Changed paths:
    engines/m4/riddle/rooms/section3/room304.cpp
    engines/m4/riddle/triggers.cpp
    engines/m4/riddle/triggers.h


diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 9c4a9557121..fb8d5fd5f80 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -473,6 +473,7 @@ void Room304::handlingStickAndSword() {
 		midi_stop();
 		digi_play("304_s11", 1);
 		break;
+
 	case 17:
 		if (_G(flags)[V084] == 1) {
 			digi_unload("304_s10");
@@ -692,7 +693,7 @@ void Room304::handlingStickAndSword() {
 		digi_unload("304_f05");
 		digi_unload("304r52");
 		sendWSMessage_140000(-1);
-		ws_hide_walker();
+		ws_hide_walker(_mei);
 
 		_field60 = series_ranged_play_xy("mc hand to chin pos3",
 			1, 0, 0, 17, 29, 295, 100, 0x100, 9);
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index ce269357928..68c1ec9ce38 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -27,12 +27,12 @@
 namespace M4 {
 namespace Riddle {
 
-void setGlobals1(int val1, int val2, int val3, int val4, int val5,
+void setGlobals1(int series, int val2, int val3, int val4, int val5,
 	int val6, int val7, int val8, int val9, int val10,
 	int val11, int val12, int val13, int val14, int val15,
 	int val16, int val17, int val18, int val19, int val20,
 	int val21) {
-	_G(globals)[GLB_TEMP_1] = val1 << 24;
+	_G(globals)[GLB_TEMP_1] = series << 24;
 	_G(globals)[GLB_TEMP_2] = val2 << 16;
 	_G(globals)[GLB_TEMP_3] = val3 << 16;
 	_G(globals)[GLB_TEMP_4] = val4 << 16;
@@ -61,8 +61,8 @@ void setGlobals3(int series, int val1, int val2) {
 	_G(globals)[GLB_TEMP_3] = val2 << 16;
 }
 
-void setGlobals4(int val1, int val2, int val3, int val4) {
-	_G(globals)[GLB_TEMP_1] = val1;
+void setGlobals4(int series, int val2, int val3, int val4) {
+	_G(globals)[GLB_TEMP_1] = series << 24;
 	_G(globals)[GLB_TEMP_2] = val2;
 	_G(globals)[GLB_TEMP_3] = val3;
 	_G(globals)[GLB_TEMP_4] = val4;
diff --git a/engines/m4/riddle/triggers.h b/engines/m4/riddle/triggers.h
index ac05984af60..bc00076dd04 100644
--- a/engines/m4/riddle/triggers.h
+++ b/engines/m4/riddle/triggers.h
@@ -32,13 +32,13 @@ extern void sendWSMessage_multi(const char *name);
 /**
  * Sets a bunch of globals. Sooooo many globals.
  */
-extern void setGlobals1(int val1, int val2, int val3, int val4, int val5,
+extern void setGlobals1(int series, int val2, int val3, int val4, int val5,
 	int val6 = 0, int val7 = 0, int val8 = 0, int val9 = 0, int val10 = 0,
 	int val11 = 0, int val12 = 0, int val13 = 0, int val14 = 0, int val15 = 0,
 	int val16 = 0, int val17 = 0, int val18 = 0, int val19 = 0, int val20 = 0,
 	int val21 = 0);
 extern void setGlobals3(int series, int val1, int val2);
-extern void setGlobals4(int val1, int val2, int val3, int val4);
+extern void setGlobals4(int series, int val2, int val3, int val4);
 
 extern void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
 	int val4, int trigger, int val9, int val6, int val7, int val8);