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

[dreammaster]

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:
c82c0082e5 M4: RIDDLE: Cutscene fixes saving Feng Li in first room


Commit: c82c0082e5ff57ac6e841e757c7ad7c666399660
    https://github.com/scummvm/scummvm/commit/c82c0082e5ff57ac6e841e757c7ad7c666399660
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-17T21:18:19-08:00

Commit Message:
M4: RIDDLE: Cutscene fixes saving Feng Li in first room

Changed paths:
    engines/m4/riddle/rooms/section3/room304.cpp
    engines/m4/riddle/rooms/section3/room304.h


diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 238dd164905..273cf027e9d 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -30,6 +30,18 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
+void Room304::preload() {
+	if (_G(flags)[V000]) {
+		_G(art_base_override) = "RIPLEYS OFFICE-TREK";
+		_G(use_alternate_attribute_file) = false;
+		_G(player).walker_type = WALKER_ALT;
+		_G(player).shadow_type = SHADOW_ALT;
+	} else {
+		_G(player).walker_type = WALKER_PLAYER;
+		_G(player).shadow_type = SHADOW_PLAYER;
+	}
+}
+
 void Room304::init() {
 	interface_show();
 	_val1 = 0;
@@ -695,7 +707,7 @@ void Room304::handlingStickAndSword() {
 		ws_hide_walker(_mei);
 
 		_field60 = series_ranged_play_xy("mc hand to chin pos3",
-			1, 0, 0, 17, 29, 295, 100, 0x100, 9);
+			1, 0, 0, 17, 29, 295, 100, 0x100, 9, -1, true);
 		digi_play("304m06", 1, 255, 55);
 		break;
 
diff --git a/engines/m4/riddle/rooms/section3/room304.h b/engines/m4/riddle/rooms/section3/room304.h
index c29bc9b3e4b..429e12e47ac 100644
--- a/engines/m4/riddle/rooms/section3/room304.h
+++ b/engines/m4/riddle/rooms/section3/room304.h
@@ -68,6 +68,7 @@ public:
 	Room304() : Room() {}
 	~Room304() override {}
 
+	void preload() override;
 	void init() override;
 	void daemon() override;
 	void pre_parser() override;