[Scummvm-git-logs] scummvm master -> 2e84cc278ef29c7596a872c473915baa01a3e80e

[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:
2e84cc278e M4: RIDDLE: Fix a buf in pre-parser of room 207, some renaming


Commit: 2e84cc278ef29c7596a872c473915baa01a3e80e
    https://github.com/scummvm/scummvm/commit/2e84cc278ef29c7596a872c473915baa01a3e80e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-01T09:49:43+01:00

Commit Message:
M4: RIDDLE: Fix a buf in pre-parser of room 207, some renaming

Changed paths:
    engines/m4/riddle/flags.h
    engines/m4/riddle/rooms/section2/room207.cpp
    engines/m4/riddle/rooms/section2/room207.h


diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index 8435e120563..2663854b5cb 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -90,7 +90,7 @@ enum Flag {
 	V055 =  55,
 	V056 =  56,
 	V057 =  57,
-	V058 =  58,
+	V058 =  58, // Room 207 - 0 = Wheel ; 1 = Wheel broken down to pieces
 	V059 =  59,
 	V060 =  60,
 	V061 =  61,
diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index be0f598c9e5..5df7b75fd1f 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -73,10 +73,10 @@ void Room207::init() {
 		_fieldA8 = 0;
 		_pipeFlag = false;
 		_fieldAE_rnd = 1;
-		_fieldB2 = false;
+		_peasantShoutingFl = false;
 	}
 
-	_fieldB6_counter = 0;
+	_guardComingDelay = 0;
 	digi_preload("950_s02", -1);
 	digi_preload("950_s03", -1);
 	digi_preload("950_s04", -1);
@@ -153,7 +153,7 @@ void Room207::init() {
 				hotspot_set_active("PEASANT", false);
 				Common::strcpy_s(_G(player).verb, "xxx");
 				Common::strcpy_s(_G(player).noun, "xxx");
-				_fieldB6_counter = 0;
+				_guardComingDelay = 0;
 				kernel_timing_trigger(60, 40);
 			}
 
@@ -231,7 +231,7 @@ void Room207::pre_parser() {
 			} else if (player_said(" ", "METAL RIM")) {
 				Common::strcpy_s(_G(player).verb, "take");
 				Common::strcpy_s(_G(player).noun, "METAL RIM");
-				_fieldB2 = false;
+				_peasantShoutingFl = false;
 			}
 		}
 
@@ -248,7 +248,7 @@ void Room207::pre_parser() {
 			} else if (player_said("take", "METAL RIM") && inv_object_is_here("METAL RIM")) {
 				Common::strcpy_s(_G(player).verb, "take");
 				Common::strcpy_s(_G(player).noun, "SPLEEN");
-			} else if (player_said(" ", "WHEEL")) {
+			} else if (player_said("take", "WHEEL")) {
 				Common::strcpy_s(_G(player).verb, "take");
 				Common::strcpy_s(_G(player).noun, "METAL RIM");
 			} else if (player_said("take", "SEVEN SPOKES") && inv_object_is_here("SEVEN SPOKES")) {
@@ -260,11 +260,11 @@ void Room207::pre_parser() {
 			} else if (player_said("LEAD PIPE", "PIPES") || player_said("LEAD PIPE", " ")) {
 				Common::strcpy_s(_G(player).verb, "take");
 				Common::strcpy_s(_G(player).noun, "pipes");
-				_fieldB2 = false;
+				_peasantShoutingFl = false;
 			}
 
 		}
-	} // if (_fieldAA)
+	} // if (_pipeFlag)
 
 	if (takeFl && player_said("PIPES") && inv_object_is_here("LEAD PIPE") && _G(flags)[V061] == 0) {
 		_G(player).need_to_walk = false;
@@ -738,8 +738,8 @@ void Room207::parser() {
 			case 6:
 				_peasantShould = 2;
 				player_set_commands_allowed(true);
-				_fieldB6_counter = 0;
-				_fieldB2 = true;
+				_guardComingDelay = 0;
+				_peasantShoutingFl = true;
 				_G(kernel).trigger_mode = KT_DAEMON;
 				kernel_timing_trigger(60, 40, nullptr);
 				break;
@@ -827,8 +827,8 @@ void Room207::parser() {
 				hotspot_set_active(_G(currentSceneDef).hotspots, "METAL RIM", false);
 				_peasantShould = 2;
 				player_set_commands_allowed(true);
-				_fieldB6_counter = 0;
-				_fieldB2 = true;
+				_guardComingDelay = 0;
+				_peasantShoutingFl = true;
 				_G(kernel).trigger_mode = KT_DAEMON;
 				kernel_timing_trigger(60, 40, nullptr);
 
@@ -1226,9 +1226,9 @@ void Room207::daemon() {
 		break;
 
 	case 40:
-		if (_fieldB2) {
-			++_fieldB6_counter;
-			if (_fieldB6_counter < 20) {
+		if (_peasantShoutingFl) {
+			++_guardComingDelay;
+			if (_guardComingDelay < 20) {
 				kernel_timing_trigger(60, 40, nullptr);
 			} else {
 				other_save_game_for_resurrection();
@@ -1595,8 +1595,8 @@ void Room207::daemon() {
 		player_set_commands_allowed(true);
 		_pipeFlag = true;
 		kernel_timing_trigger(1, 100, nullptr);
-		_fieldB6_counter = 0;
-		_fieldB2 = true;
+		_guardComingDelay = 0;
+		_peasantShoutingFl = true;
 		kernel_timing_trigger(60, 40, nullptr);
 
 		break;
diff --git a/engines/m4/riddle/rooms/section2/room207.h b/engines/m4/riddle/rooms/section2/room207.h
index 52c90d83b00..760ff8e58f9 100644
--- a/engines/m4/riddle/rooms/section2/room207.h
+++ b/engines/m4/riddle/rooms/section2/room207.h
@@ -49,8 +49,8 @@ private:
 	int32 _fieldA8 = 0; // unused ?
 	bool _pipeFlag = false;
 	int32 _fieldAE_rnd = 0;
-	bool _fieldB2 = false;
-	int32 _fieldB6_counter = 0;
+	bool _peasantShoutingFl = false;
+	int32 _guardComingDelay = 0;
 	int32 _fieldC2 = 0;
 	bool _fieldC6 = false; // always false??