[Scummvm-git-logs] scummvm master -> 9341cf9c06802ef7a529b99e591586307b7a8e13

dreammaster noreply at scummvm.org
Sun Feb 9 20:40:45 UTC 2025


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

Summary:
486b83ab42 M4: RIDDLE: Added room 852
f814da6cb5 M4: RIDDLE: Fix entering tomb
e3e90dffd9 M4: RIDDLE: Fix getting wooden post
3b9b3af48b M4: RIDDLE: Fixes for pushing statues
9341cf9c06 M4: RIDDLE: Fix triggering booby traps


Commit: 486b83ab42031a5fa440bbbd3ba993e9ba0e991e
    https://github.com/scummvm/scummvm/commit/486b83ab42031a5fa440bbbd3ba993e9ba0e991e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T12:40:34-08:00

Commit Message:
M4: RIDDLE: Added room 852

Changed paths:
  A engines/m4/riddle/rooms/section8/room852.cpp
  A engines/m4/riddle/rooms/section8/room852.h
    engines/m4/module.mk
    engines/m4/riddle/rooms/section8/section8.cpp
    engines/m4/riddle/rooms/section8/section8.h


diff --git a/engines/m4/module.mk b/engines/m4/module.mk
index 463673b8678..4da112ac4f6 100644
--- a/engines/m4/module.mk
+++ b/engines/m4/module.mk
@@ -298,6 +298,7 @@ MODULE_OBJS = \
 	riddle/rooms/section8/room834.o \
 	riddle/rooms/section8/room844.o \
 	riddle/rooms/section8/room850.o \
+	riddle/rooms/section8/room852.o \
 	riddle/rooms/section8/room860.o \
 	riddle/rooms/section8/room861.o \
 	riddle/rooms/section9/section9.o \
diff --git a/engines/m4/riddle/rooms/section8/room852.cpp b/engines/m4/riddle/rooms/section8/room852.cpp
new file mode 100644
index 00000000000..8c1a98cc2ee
--- /dev/null
+++ b/engines/m4/riddle/rooms/section8/room852.cpp
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/ },.
+ *
+ */
+
+#include "m4/riddle/rooms/section8/room852.h"
+#include "m4/graphics/gr_series.h"
+#include "m4/riddle/vars.h"
+
+namespace M4 {
+namespace Riddle {
+namespace Rooms {
+
+void Room852::preload() {
+	_G(player).walker_type = WALKER_ALT;
+	_G(player).shadow_type = SHADOW_ALT;
+	_G(player).walker_in_this_scene = false;
+}
+
+void Room852::init() {
+	interface_hide();
+	player_set_commands_allowed(false);
+	digi_preload("852_s01");
+	digi_preload("852r03");
+	kernel_timing_trigger(30, 1);
+}
+
+void Room852::daemon() {
+	switch (_G(kernel).trigger) {
+	case 1:
+		_all = series_stream("852all", 5, 0x100, -1);
+		series_stream_break_on_frame(_all, 56, 6);
+		break;
+
+	case 6:
+		series_stream_break_on_frame(_all, 95, 7);
+		digi_play("852r03", 2);
+		break;
+
+	case 7:
+		series_stream_break_on_frame(_all, 255, 9);
+		digi_play("852_s01", 2, 255, 8);
+		break;
+
+	case 8:
+		digi_play("950_s29", 2);
+		break;
+
+	case 9:
+		disable_player_commands_and_fade_init(11);
+		break;
+
+	case 11:
+		_G(game).setRoom(803);
+		break;
+
+	default:
+		break;
+	}
+}
+
+void Room852::shutdown() {
+	interface_show();
+}
+
+} // namespace Rooms
+} // namespace Riddle
+} // namespace M4
diff --git a/engines/m4/riddle/rooms/section8/room852.h b/engines/m4/riddle/rooms/section8/room852.h
new file mode 100644
index 00000000000..16ab1992fc6
--- /dev/null
+++ b/engines/m4/riddle/rooms/section8/room852.h
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef M4_RIDDLE_ROOMS_SECTION8_ROOM852_H
+#define M4_RIDDLE_ROOMS_SECTION8_ROOM852_H
+
+#include "m4/riddle/rooms/room.h"
+
+namespace M4 {
+namespace Riddle {
+namespace Rooms {
+
+class Room852 : public Room {
+private:
+	machine *_all = nullptr;
+
+public:
+	Room852() : Room() {}
+	~Room852() override {}
+
+	void preload() override;
+	void init() override;
+	void daemon() override;
+	void shutdown() override;
+};
+
+} // namespace Rooms
+} // namespace Riddle
+} // namespace M4
+
+#endif
diff --git a/engines/m4/riddle/rooms/section8/section8.cpp b/engines/m4/riddle/rooms/section8/section8.cpp
index 59c032f638e..6eaf40709a2 100644
--- a/engines/m4/riddle/rooms/section8/section8.cpp
+++ b/engines/m4/riddle/rooms/section8/section8.cpp
@@ -63,6 +63,7 @@ Section8::Section8() : Rooms::Section() {
 	add(834, &_room834);
 	add(844, &_room844);
 	add(850, &_room850);
+	add(852, &_room852);
 	add(860, &_room860);
 	add(861, &_room861);
 }
diff --git a/engines/m4/riddle/rooms/section8/section8.h b/engines/m4/riddle/rooms/section8/section8.h
index 340d56327ec..3c0ad04ec76 100644
--- a/engines/m4/riddle/rooms/section8/section8.h
+++ b/engines/m4/riddle/rooms/section8/section8.h
@@ -40,6 +40,7 @@
 #include "m4/riddle/rooms/section8/room834.h"
 #include "m4/riddle/rooms/section8/room844.h"
 #include "m4/riddle/rooms/section8/room850.h"
+#include "m4/riddle/rooms/section8/room852.h"
 #include "m4/riddle/rooms/section8/room860.h"
 #include "m4/riddle/rooms/section8/room861.h"
 
@@ -72,6 +73,7 @@ private:
 	Room834 _room834;
 	Room844 _room844;
 	Room850 _room850;
+	Room852 _room852;
 	Room860 _room860;
 	Room861 _room861;
 


Commit: f814da6cb578baf447a22c99f71bae10a8471865
    https://github.com/scummvm/scummvm/commit/f814da6cb578baf447a22c99f71bae10a8471865
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T12:40:34-08:00

Commit Message:
M4: RIDDLE: Fix entering tomb

Changed paths:
    engines/m4/riddle/rooms/section8/room803.cpp


diff --git a/engines/m4/riddle/rooms/section8/room803.cpp b/engines/m4/riddle/rooms/section8/room803.cpp
index 3703058fd7f..f904b093d07 100644
--- a/engines/m4/riddle/rooms/section8/room803.cpp
+++ b/engines/m4/riddle/rooms/section8/room803.cpp
@@ -467,10 +467,9 @@ void Room803::initWalker() {
 		ws_demand_facing(_G(my_walker), 7);
 		if (_G(flags)[V276] == 0) {
 			ws_hide_walker(_G(my_walker));
-			_meiStepOffPileMach = series_play("MEI STEPS OFF PILE", 0, 15, 2, 5, 0, 100, 0, 0, 0, 0);
+			_meiStepOffPileMach = series_play("MEI STEPS OFF PILE", 0, 16, 2, 5, 0, 100, 0, 0, 0, 0);
 			kernel_timing_trigger(15, 1, nullptr);
 		}
-
 		break;
 	}
 
@@ -490,7 +489,7 @@ void Room803::daemonSub1() {
 	case 1:
 		player_set_commands_allowed(false);
 		terminateMachine(_meiStepOffPileMach);
-		_meiStepOffPileMach = series_play("MEI STEPS OFF PILE", 0, 15, 2, 5, 0, 100, 0, 0, 0, 56);
+		_meiStepOffPileMach = series_play("MEI STEPS OFF PILE", 0, 16, 2, 5, 0, 100, 0, 0, 0, 56);
 		break;
 
 	case 2:


Commit: e3e90dffd96af70ab2621f6cf633f67d0a824005
    https://github.com/scummvm/scummvm/commit/e3e90dffd96af70ab2621f6cf633f67d0a824005
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T12:40:34-08:00

Commit Message:
M4: RIDDLE: Fix getting wooden post

Changed paths:
    engines/m4/riddle/rooms/section8/room805.cpp
    engines/m4/riddle/rooms/section8/room805.h


diff --git a/engines/m4/riddle/rooms/section8/room805.cpp b/engines/m4/riddle/rooms/section8/room805.cpp
index d9d88f7c31f..7c01fa388f7 100644
--- a/engines/m4/riddle/rooms/section8/room805.cpp
+++ b/engines/m4/riddle/rooms/section8/room805.cpp
@@ -492,22 +492,19 @@ void Room805::parser() {
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_set_commands_allowed(false);
-			setGlobals1(_unkSeries1, 1, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_ripLookDownPos3, 1, 9, 9, 9);
 			sendWSMessage_110000(_G(my_walker), 10);
 			digi_stop(1);
-
 			break;
 
 		case 2:
 			player_set_commands_allowed(true);
 			_unkFlag1 = false;
-
 			break;
 
 		case 10:
 			sendWSMessage_140000(_G(my_walker), -1);
 			digi_play("805r07", 1, 255, 2, -1);
-
 			break;
 
 		default:
@@ -645,7 +642,7 @@ void Room805::parser() {
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_set_commands_allowed(false);
-			setGlobals1(_unkSeries5, 1, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_ripMedHiReachPos2, 1, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 			sendWSMessage_110000(_G(my_walker), 10);
 			digi_stop(1);
 
@@ -688,7 +685,7 @@ void Room805::parser() {
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_set_commands_allowed(false);
-			setGlobals1(_unkSeries6, 1, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+			setGlobals1(_ripMedHiReachPos3, 1, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 			sendWSMessage_110000(_G(my_walker), 10);
 			digi_stop(1);
 
@@ -736,12 +733,11 @@ void Room805::parser() {
 				player_set_commands_allowed(false);
 				player_update_info(_G(my_walker), &_G(player_info));
 				player_set_commands_allowed(false);
-				setGlobals1(_unkSeries7, 1, 16, 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+				setGlobals1(_ripLowReachPos2, 1, 16, 16, 16);
 				sendWSMessage_110000(_G(my_walker), 10);
 			}
 
 			digi_stop(1);
-
 			break;
 
 		case 10:
@@ -749,7 +745,6 @@ void Room805::parser() {
 			_unkFlag1 = true;
 			kernel_examine_inventory_object("PING WOODEN POST", _G(master_palette), 5, 1, 386, 279, 20, nullptr, -1);
 			terminateMachine(_fallenBeamOnFloorMach);
-
 			break;
 
 		case 20:
@@ -760,7 +755,6 @@ void Room805::parser() {
 			_unkFlag1 = false;
 			hotspot_set_active(_G(currentSceneDef).hotspots, "WOODEN POST", false);
 			player_set_commands_allowed(true);
-
 			break;
 
 		default:
@@ -824,7 +818,7 @@ void Room805::parser() {
 		}
 
 		ws_demand_facing(_G(my_walker), 3);
-		setGlobals1(_unkSeries8, 1, 5, 1, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+		setGlobals1(_ripTalkerPos3, 1, 5, 1, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 		sendWSMessage_110000(_G(my_walker), -1);
 	} // if (talkFl && player_said("MEI CHEN"))
 
@@ -885,7 +879,7 @@ void Room805::parser() {
 		case -1:
 			if (_G(flags)[V257]) {
 				player_set_commands_allowed(false);
-				setGlobals1(_unkSeries5, 1, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+				setGlobals1(_ripMedHiReachPos2, 1, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 				sendWSMessage_110000(_G(my_walker), 10);
 				digi_stop(1);
 			} else {
@@ -924,7 +918,7 @@ void Room805::parser() {
 		case -1:
 			if (_G(flags)[V258]) {
 				player_set_commands_allowed(false);
-				setGlobals1(_unkSeries6, 1, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+				setGlobals1(_ripMedHiReachPos3, 1, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 				sendWSMessage_110000(_G(my_walker), 10);
 				digi_stop(1);
 			} else {
diff --git a/engines/m4/riddle/rooms/section8/room805.h b/engines/m4/riddle/rooms/section8/room805.h
index b930f023d01..14945464ab1 100644
--- a/engines/m4/riddle/rooms/section8/room805.h
+++ b/engines/m4/riddle/rooms/section8/room805.h
@@ -54,12 +54,6 @@ private:
 	int32 _ripSiftsDirtSeries = 0;
 	int32 _ripTalkerPos3 = 0;
 
-	int32 _unkSeries1 = 0;
-	int32 _unkSeries5 = 0;
-	int32 _unkSeries6 = 0;
-	int32 _unkSeries7 = 0;
-	int32 _unkSeries8 = 0;
-
 	bool _unkFlag1 = false;
 
 	machine *_chariotRestMach = nullptr;


Commit: 3b9b3af48ba0e7143e0b12dae929491e74c181d8
    https://github.com/scummvm/scummvm/commit/3b9b3af48ba0e7143e0b12dae929491e74c181d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T12:40:34-08:00

Commit Message:
M4: RIDDLE: Fixes for pushing statues

Changed paths:
    engines/m4/riddle/rooms/section8/room805.cpp
    engines/m4/riddle/rooms/section8/room834.cpp
    engines/m4/riddle/rooms/section8/section8_room.cpp
    engines/m4/riddle/rooms/section8/section8_room.h


diff --git a/engines/m4/riddle/rooms/section8/room805.cpp b/engines/m4/riddle/rooms/section8/room805.cpp
index 7c01fa388f7..43d1e93799a 100644
--- a/engines/m4/riddle/rooms/section8/room805.cpp
+++ b/engines/m4/riddle/rooms/section8/room805.cpp
@@ -197,6 +197,7 @@ void Room805::daemonSub1() {
 
 	case 102:
 	case 103:
+	case 107:
 	case 108:
 		ws_walk(_G(my_walker), 295, 305, nullptr, -1, 3, true);
 		ws_walk(_mcMach, 250, 201, nullptr, 101, 3, true);
@@ -1194,6 +1195,7 @@ void Room805::daemon() {
 	case 103:
 	case 104:
 	case 105:
+	case 107:
 	case 108:
 	case 109:
 	case 111:
diff --git a/engines/m4/riddle/rooms/section8/room834.cpp b/engines/m4/riddle/rooms/section8/room834.cpp
index 1925d50def5..dbcbb4ed2c4 100644
--- a/engines/m4/riddle/rooms/section8/room834.cpp
+++ b/engines/m4/riddle/rooms/section8/room834.cpp
@@ -45,13 +45,13 @@ void Room834::init() {
 	_var5 = 7;
 
 	getSeriesName(2, false);
-	_machArr[0] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	_machArr[0] = series_play(_currentSeriesName.c_str(), 0x2ff, 16, -1, 0, 0, 100, 0, 0, 0, -1);
 	getSeriesName(3, false);
-	_machArr[1] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
-	getSeriesName(6, false);
-	_machArr[2] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	_machArr[1] = series_play(_currentSeriesName.c_str(), 0x2ff, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	getSeriesName(5, false);
+	_machArr[2] = series_play(_currentSeriesName.c_str(), 0x2ff, 16, -1, 0, 0, 100, 0, 0, 0, -1);
 	getSeriesName(7, false);
-	_machArr[3] = series_play(_currentSeriesName.c_str(), 767, 16, -1, 0, 0, 100, 0, 0, 0, -1);
+	_machArr[3] = series_play(_currentSeriesName.c_str(), 0x2ff, 16, -1, 0, 0, 100, 0, 0, 0, -1);
 
 	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN", false);
 	hotspot_set_active(_G(currentSceneDef).hotspots, "MEI CHEN ", false);
diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index 06dc45fe3b1..05bcbf0afdb 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -31,7 +31,7 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
-int32 Section8Room::subCE498(int32 val1) {
+int32 Section8Room::getStatueIndex(int32 val1) {
 	if (val1 == _var2)
 		return 0;
 
@@ -63,7 +63,7 @@ int32 Section8Room::subCE52E(int32 val1) {
 	if (_currentRoom == 834 && val1 == 5)
 		return 2;
 
-	if (subCE498(val1) < 0)
+	if (getStatueIndex(val1) < 0)
 		return 0;
 
 	return 1;
@@ -79,7 +79,7 @@ void Section8Room::moveScreen(int32 dx, int32 dy) {
 }
 
 void Section8Room::getSeriesName(int32 val1, bool true_or_False) {
-	if (subCE498(val1) < 0)
+	if (getStatueIndex(val1) < 0)
 		_currentSeriesName = Common::String::format("%dsldf%d", _currentRoom, val1);
 	else if (true_or_False)
 		_currentSeriesName = Common::String::format("%dsldr%d", _currentRoom, val1);
@@ -912,11 +912,10 @@ void Section8Room::daemon() {
 	case 16: {
 		player_set_commands_allowed(false);
 		ws_hide_walker(_G(my_walker));
-		int32 retVal = subCE498(_coordArrayId);
-		if (retVal > 0) {
-			terminateMachine(_machArr[retVal]);
-			_machArr[retVal] = nullptr;
-		}
+
+		int32 retVal = getStatueIndex(_coordArrayId);
+		if (retVal >= 0)
+			terminateMachineAndNull(_machArr[retVal]);
 
 		getSeriesName(_coordArrayId, true);
 		_dynSerie1 = series_load(_currentSeriesName.c_str(), -1, nullptr);
@@ -949,7 +948,7 @@ void Section8Room::daemon() {
 		break;
 
 	case 19:
-		if (subCE498(_coordArrayId) < 0) {
+		if (getStatueIndex(_coordArrayId) < 0) {
 			kernel_timing_trigger(120, 20, nullptr);
 			digi_play("950_s32", 2, 255, -1, -1);
 		} else {
@@ -987,7 +986,7 @@ void Section8Room::daemon() {
 		series_unload(_dynSerie1);
 		ws_unhide_walker(_G(my_walker));
 		ws_demand_facing(_G(my_walker), 3);
-		int32 retVal = subCE498(_coordArrayId);
+		int32 retVal = getStatueIndex(_coordArrayId);
 		if (retVal < 0) {
 			digi_play("com066", 1, 255, -1, 997);
 		} else {
diff --git a/engines/m4/riddle/rooms/section8/section8_room.h b/engines/m4/riddle/rooms/section8/section8_room.h
index 5bf5a2a9bb3..012234ff461 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.h
+++ b/engines/m4/riddle/rooms/section8/section8_room.h
@@ -86,7 +86,7 @@ protected:
 	machine *_mcTrekMach = nullptr;
 	machine *_ripPushMach = nullptr;
 
-	int32 subCE498(int32 val1);
+	int32 getStatueIndex(int32 val1);
 	void sendWSMessage_3840000(machine *machine, int32 trigger);
 	int32 subCE52E(int32 val1);
 	void moveScreen(int32 dx, int32 dy);


Commit: 9341cf9c06802ef7a529b99e591586307b7a8e13
    https://github.com/scummvm/scummvm/commit/9341cf9c06802ef7a529b99e591586307b7a8e13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-09T12:40:34-08:00

Commit Message:
M4: RIDDLE: Fix triggering booby traps

Changed paths:
    engines/m4/riddle/rooms/section8/room806.cpp
    engines/m4/riddle/rooms/section8/room807.cpp


diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 6007b1af88d..8c44a0cd2bc 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -254,7 +254,7 @@ void Room806::pre_parser() {
 		_G(player).waiting_for_walk = false;
 	}
 
-	if (walkFl && player_said_any("  ", "   ")) {
+	if (!walkFl && player_said_any("  ", "   ")) {
 		_G(player).need_to_walk = false;
 		_G(player).ready_to_walk = true;
 		_G(player).waiting_for_walk = false;
diff --git a/engines/m4/riddle/rooms/section8/room807.cpp b/engines/m4/riddle/rooms/section8/room807.cpp
index bcb919a05b6..ee87f61d15a 100644
--- a/engines/m4/riddle/rooms/section8/room807.cpp
+++ b/engines/m4/riddle/rooms/section8/room807.cpp
@@ -154,7 +154,7 @@ void Room807::init() {
 		_field38 = 0;
 
 		if (!player_been_here(807)) {
-			_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 450, 60, 1, Walker::player_walker_callback, "mc_trek");
+			_mcTrekMach = triggerMachineByHash_3000(8, 4, *S8_SHADOW_DIRS2, *S8_SHADOW_DIRS1, 450, 600, 1, Walker::player_walker_callback, "mc_trek");
 			ws_demand_location(_G(my_walker), 366, 345);
 			ws_demand_facing(_G(my_walker), 11);
 			ws_hide_walker(_G(my_walker));




More information about the Scummvm-git-logs mailing list