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

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
19af4560da M4: RIDDLE: Peasant room 207 setup fixes
bca46d8c46 M4: RIDDLE: Fix walker sprite series definitions


Commit: 19af4560da62732de0202a7324309e97cdd23510
    https://github.com/scummvm/scummvm/commit/19af4560da62732de0202a7324309e97cdd23510
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-09T14:33:19-08:00

Commit Message:
M4: RIDDLE: Peasant room 207 setup fixes

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


diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index 7169916e200..26e04445a37 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -127,7 +127,37 @@ void Room207::init() {
 		hotspot_set_active(_G(currentSceneDef).hotspots, "PEASANT", false);
 	}
 
-	if (_G(game).previous_room != KERNEL_RESTORING_GAME) {
+	switch (_G(game).previous_room) {
+	case KERNEL_RESTORING_GAME:
+		if (!_G(flags)[V061]) {
+			if (_pipeFlag) {
+				hotspot_set_active("PEASANT", false);
+				Common::strcpy_s(_G(player).verb, "xxx");
+				Common::strcpy_s(_G(player).noun, "xxx");
+				_fieldB6_counter = 0;
+				kernel_timing_trigger(60, 40);
+			}
+
+			series_play_xy("shadow pesky rock loop", -1, 0, 514, 367, 97, 0xf09, 300, -1);
+			_ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 514, 367, 97, 0xf00, false,
+				triggerMachineByHashCallback, "pp squat");
+
+			if (inv_player_has("LEAD PIPE")) {
+				_peskyPointsRipForegroundSeries = series_load("pesky points at rip foreground", -1, nullptr);
+				sendWSMessage_10000(1, _ppSquatMach, _peskyPointsRipForegroundSeries, 19, 19, 100,
+					_peskyPointsRipForegroundSeries, 19, 19, 0);
+			} else if (inv_player_has("METAL RIM")) {
+				_peskyPointsRipBackgroundSeries = series_load("pesky points at rip background", -1, nullptr);
+				sendWSMessage_10000(1, _ppSquatMach, _peskyPointsRipBackgroundSeries,
+					19, 19, 100, _peskyPointsRipBackgroundSeries, 19, 19, 0);
+			} else {
+				sendWSMessage_10000(1, _ppSquatMach, _peskyRockLoopSeries, 1, 20, 101,
+					_peskyRockLoopSeries, 20, 20, 0);
+			}
+		}
+		break;
+
+	default:
 		ws_demand_location(_G(my_walker), 375, 347);
 		ws_demand_facing(_G(my_walker), 10);
 		if (_G(flags[V061]) == 0) {
@@ -139,19 +169,6 @@ void Room207::init() {
 			_ppWalkerMach = triggerMachineByHash_3000(8, 6, *S2_PEASANT_NORMAL_DIRS, *S2_PEASANT_SHADOW_DIRS, 660, 367, 9, triggerMachineByHashCallback3000, "pp walker");
 			sendWSMessage_10000(_ppWalkerMach, 562, 359, 9, 10, 1);
 		}
-
-	} else { // KERNEL_RESTORING_GAME
-		series_play_xy("shadow pesky rock loop", -1, 0, 514, 367, 97, 3849, 300, -1);
-		_ppSquatMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 614, 367, 97, 3840, false, triggerMachineByHashCallback, "pp squat");
-
-		if (inv_player_has("LEAD PIPE")) {
-			_peskyPointsRipForegroundSeries = series_load("pesky points at rip foreground", -1, nullptr);
-			sendWSMessage_10000(1, _ppSquatMach, 1, _peskyPointsRipForegroundSeries, 19, 100, _peskyPointsRipForegroundSeries, 19, 19, 0);
-		} else if (inv_player_has("METAL RIM")) {
-			_peskyPointsRipBackgroundSeries = series_load("pesky points at rip background", -1, nullptr);
-			sendWSMessage_10000(1, _ppSquatMach, 1, _peskyPointsRipBackgroundSeries, 19, 100, _peskyPointsRipBackgroundSeries, 19, 19, 0);
-		} else
-			sendWSMessage_10000(1, _ppSquatMach, 1, _peskyRockLoopSeries, 20, 101, _peskyRockLoopSeries, 20, 20, 0);
 	}
 
 	digi_play("950_s02", 3, 30, -1, -1);


Commit: bca46d8c4662d4d8efcf4c4c26bafa19cb79dad2
    https://github.com/scummvm/scummvm/commit/bca46d8c4662d4d8efcf4c4c26bafa19cb79dad2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-09T14:33:19-08:00

Commit Message:
M4: RIDDLE: Fix walker sprite series definitions

Changed paths:
    engines/m4/riddle/walker.cpp


diff --git a/engines/m4/riddle/walker.cpp b/engines/m4/riddle/walker.cpp
index 43eb792de82..af7a01947d2 100644
--- a/engines/m4/riddle/walker.cpp
+++ b/engines/m4/riddle/walker.cpp
@@ -45,20 +45,20 @@ static const char *RIPLEY_SHADOWS[5] = {
 	"ripsh1", "ripsh2", "ripsh3", "ripsh4", "ripsh5"
 };
 
-static const char *SAFARI_SERIES[4] = {
+static const char *SAFARI_SERIES[5] = {
 	"rip safari walker position 1",
 	"rip safari walker position 2",
 	"rip safari walker position 3",
-	"rip safari walker position 4"
+	"rip safari walker position 4",
+	"rip safari walker position 5"
 };
 static const int16 SAFARI_SERIES_DIRS[] = {
 	0, 1, 2, 3, 4, -4
 };
 
-static const char *SAFARI_SHADOWS[8] = {
+static const char *SAFARI_SHADOWS[5] = {
 	"safari shadow 1", "safari shadow 2", "safari shadow 3",
-	"safari shadow 4", "safari shadow 5", "trek feng walker pos 3",
-	"trek feng walker pos 4", "trek feng walker pos 5"
+	"safari shadow 4", "safari shadow 5"
 };
 static const int16 SAFARI_SHADOWS_DIRS[6] = {
 	10, 11, 12, 13, 14, -1