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

[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:
aa5630b5ba M4: RIDDLE: room 704: Some renaming


Commit: aa5630b5ba0fc406471d63b192edcaa58ba3c039
    https://github.com/scummvm/scummvm/commit/aa5630b5ba0fc406471d63b192edcaa58ba3c039
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-01T22:03:19+01:00

Commit Message:
M4: RIDDLE: room 704: Some renaming

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


diff --git a/engines/m4/riddle/rooms/section7/room704.cpp b/engines/m4/riddle/rooms/section7/room704.cpp
index 9e44670c407..5c255deed7d 100644
--- a/engines/m4/riddle/rooms/section7/room704.cpp
+++ b/engines/m4/riddle/rooms/section7/room704.cpp
@@ -121,7 +121,7 @@ void Room704::parser() {
 }
 
 void Room704::daemon() {
-	bool ecx = player_said("take");
+	const bool takeFl = player_said("take");
 
 	switch (_G(kernel).trigger) {
 	case 70:
@@ -232,7 +232,7 @@ void Room704::daemon() {
 		break;
 
 	case 83:
-		if (ecx && _G(player).click_y <= 374) {
+		if (takeFl && _G(player).click_y <= 374) {
 			switch (imath_ranged_rand(1, 3)) {
 			case 1:
 				digi_play("com077", 1, 255, 84, -1);
@@ -266,13 +266,13 @@ void Room704::daemon() {
 		break;
 
 	case 123:
-		if (_field58 != 124)
+		if (_field58_mode != 124)
 			break;
 
-		switch (_field5C) {
+		switch (_field5C_should) {
 		case 121:
 			_704Eye2aSeries = series_load("704EYE2a", -1, nullptr);
-			_field5C = 922;
+			_field5C_should = 922;
 			_monkMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 256, false, callback, "monk");
 			sendWSMessage_10000(1, _monkMach, _704Eye2aSeries, 1, 5, 123, _704Eye2aSeries, 5, 5, 0);
 
@@ -298,11 +298,11 @@ void Room704::daemon() {
 		case 922:
 			switch (imath_ranged_rand(1, 2)) {
 			case 1:
-				_field5C = 923;
+				_field5C_should = 923;
 				break;
 
 			case 2:
-				_field5C = 924;
+				_field5C_should = 924;
 				break;
 
 			default:
@@ -314,7 +314,7 @@ void Room704::daemon() {
 			break;
 
 		case 923:
-			_field5C = 925;
+			_field5C_should = 925;
 			sendWSMessage_10000(1, _monkMach, _704Eye2aSeries, 6, 7, -1, _704Eye2aSeries, 11, 13, 4);
 			sendWSMessage_1a0000(_monkMach, 9);
 			digi_play(conv_sound_to_play(), 1, 255, 123, -1);
@@ -322,7 +322,7 @@ void Room704::daemon() {
 			break;
 
 		case 924:
-			_field5C = 925;
+			_field5C_should = 925;
 			sendWSMessage_10000(1, _monkMach, _704Eye2aSeries, 6, 10, -1, _704Eye2aSeries, 11, 13, 4);
 			sendWSMessage_1a0000(_monkMach, 9);
 			digi_play(conv_sound_to_play(), 1, 255, 123, -1);
@@ -330,13 +330,13 @@ void Room704::daemon() {
 			break;
 
 		case 925:
-			_field5C = 926;
+			_field5C_should = 926;
 			sendWSMessage_10000(1, _monkMach, _704Eye2aSeries, 14, 17, 123, _704Eye2aSeries, 17, 17, 0);
 
 			break;
 
 		case 926:
-			_field5C = 122;
+			_field5C_should = 122;
 			kernel_timing_trigger(10, 123, nullptr);
 
 			break;
@@ -348,10 +348,10 @@ void Room704::daemon() {
 		break;
 
 	case 127:
-		if (_field58 != 124)
+		if (_field58_mode != 124)
 			break;
 
-		switch (_field5C) {
+		switch (_field5C_should) {
 		case 121:
 		case 122:
 		case 124:
diff --git a/engines/m4/riddle/rooms/section7/room704.h b/engines/m4/riddle/rooms/section7/room704.h
index e151b5dd017..3bd90cff7be 100644
--- a/engines/m4/riddle/rooms/section7/room704.h
+++ b/engines/m4/riddle/rooms/section7/room704.h
@@ -42,8 +42,8 @@ public:
 private:
 	static void callback(frac16 myMessage, machine *sender);
 
-	int32 _field58 = 0;
-	int32 _field5C = 0;
+	int32 _field58_mode = 0;
+	int32 _field5C_should = 0;
 
 	int32 _704Eye2aSeries = 0;
 	int32 _ripGoesDownStairsSeries = 0;