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

[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:
fa0bb2d35b M4: RIDDLE: room 705: Fix issue (2 variable defined instead of 1)


Commit: fa0bb2d35b6f4a105fb24d973f124793ea6c9519
    https://github.com/scummvm/scummvm/commit/fa0bb2d35b6f4a105fb24d973f124793ea6c9519
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-09T01:34:12+01:00

Commit Message:
M4: RIDDLE: room 705: Fix issue (2 variable defined instead of 1)

Changed paths:
    engines/m4/riddle/rooms/section7/room705.cpp
    engines/m4/riddle/rooms/section7/room705.h


diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index 897faad6ae4..ae3240f4ab6 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -713,7 +713,7 @@ void Room705::daemon() {
 	switch (_G(kernel).trigger) {
 	case 70:
 		player_set_commands_allowed(false);
-		setGlobals1(_field24Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+		setGlobals1(_ripTrekMedReachPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
 		sendWSMessage_110000(_G(my_walker), 71);
 
 		break;
@@ -800,7 +800,7 @@ void Room705::daemon() {
 
 	case 80:
 		player_set_commands_allowed(false);
-		setGlobals1(_field24Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+		setGlobals1(_ripTrekMedReachPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
 		sendWSMessage_110000(_G(my_walker), 81);
 
 		break;
@@ -1033,7 +1033,7 @@ void Room705::daemon() {
 
 	case 140:
 		player_set_commands_allowed(false);
-		setGlobals1(_field24Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+		setGlobals1(_ripTrekMedReachPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
 		sendWSMessage_110000(_G(my_walker), 141);
 
 		break;
@@ -1283,7 +1283,7 @@ void Room705::useWheelOnLeftNiche(int32 trigger, int val1) {
 		if (_G(flags[V220])) {
 			digi_play("com080", 1, 255, 114, -1);
 		} else {
-			setGlobals1(_field24Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_ripTrekMedReachPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
 			sendWSMessage_110000(_G(my_walker), 101);
 		}
 
@@ -1435,7 +1435,7 @@ void Room705::useWheelOnRightNiche(int32 trigger, int val1) {
 		if (_G(flags[V221])) {
 			digi_play("com080", 1, 255, 114, -1);
 		} else {
-			setGlobals1(_field24Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_ripTrekMedReachPos1Series, 1, 5, 5, 5, 0, 5, 10, 10, 10, 0, 10, 1, 1, 1, 0, 0, 0, 0, 0, 0);
 			sendWSMessage_110000(_G(my_walker), 101);
 		}
 
diff --git a/engines/m4/riddle/rooms/section7/room705.h b/engines/m4/riddle/rooms/section7/room705.h
index 9188023abd0..be2083937b5 100644
--- a/engines/m4/riddle/rooms/section7/room705.h
+++ b/engines/m4/riddle/rooms/section7/room705.h
@@ -46,7 +46,6 @@ private:
 	void useWheelOnLeftNiche(int32 trigger, int val1);
 	void useWheelOnRightNiche(int32 trigger, int val1);
 
-	int32 _field24Series = 0;
 	int32 _field60_mode = 0;
 	int32 _field64_should = 0;