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

[dreammaster]

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

Summary:
d07ed32d3e MADS: FOREST: Fix cutscene using Edgar to defeat Weasel


Commit: d07ed32d3e74c4791e6486aa3d5e1bf9b991dab0
    https://github.com/scummvm/scummvm/commit/d07ed32d3e74c4791e6486aa3d5e1bf9b991dab0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-30T21:36:47+10:00

Commit Message:
MADS: FOREST: Fix cutscene using Edgar to defeat Weasel

Changed paths:
    engines/mads/madsv2/forest/rooms/room203.cpp


diff --git a/engines/mads/madsv2/forest/rooms/room203.cpp b/engines/mads/madsv2/forest/rooms/room203.cpp
index 21e50bdc8e6..334a8a773a8 100644
--- a/engines/mads/madsv2/forest/rooms/room203.cpp
+++ b/engines/mads/madsv2/forest/rooms/room203.cpp
@@ -921,13 +921,13 @@ static void room_203_anim5() {
 			if (frame == 1) {
 				global_midi_play(12);
 				local->_a6 = 4;
-			} else if (frame == 19) {
+			} else if (frame == 18) {
 				digi_play_build(103, '_', 3, 2);
 				if (local->_a6 != 2) {
 					global_midi_play(15);
 					local->_a6 = 2;
 				}
-			} else if (frame == 22) {
+			} else if (frame == 21) {
 				digi_play_build(203, '_', 500, 2);
 			}
 		}
@@ -1174,7 +1174,7 @@ static void room_203_daemon() {
 
 			global[g131] = 0;
 			kernel_synch(KERNEL_ANIM, aa[1], KERNEL_ANIM, local->_9e);
-			kernel_synch(KERNEL_ANIM, 0, KERNEL_PLAYER, aa[1]);
+			kernel_synch(KERNEL_PLAYER, 0, KERNEL_ANIM, aa[1]);
 			global[g133] = 1;
 			break;
 
@@ -1184,12 +1184,11 @@ static void room_203_daemon() {
 			aainfo[1]._frame = 0;
 			local->_96 = 52;
 			player.commands_allowed = false;
-			player.walker_visible = false;
 			kernel_reset_animation(local->_9e, 0);
 
 			global[g131] = 0;
 			kernel_synch(KERNEL_ANIM, aa[1], KERNEL_ANIM, local->_9e);
-			kernel_synch(KERNEL_ANIM, 0, KERNEL_PLAYER, aa[1]);
+			kernel_synch(KERNEL_PLAYER, 0, KERNEL_ANIM, aa[1]);
 			global[g133] = 1;
 			break;
 
@@ -1355,6 +1354,7 @@ static void room_203_daemon() {
 			kernel_position_anim(local->_a0, 132, 133, 88, 6);
 			local->_9e = kernel_run_animation_disp('e', 3, 0);
 			kernel_position_anim(local->_9e, 105, 137, 90, 5);
+			global[walker_converse_state] = 0;
 			close_interface(CANDLE_FLY);
 			clear_selected_item();
 			global[g046] = -1;
@@ -1482,7 +1482,7 @@ static void room_203_daemon() {
 			aainfo[1]._frame = 0;
 			aainfo[1]._val4 = 0;
 			aainfo[4]._frame = 17;
-			kernel_reset_animation(aa[4], 0);
+			kernel_reset_animation(aa[4], 17);
 			kernel_synch(KERNEL_ANIM, aa[4], KERNEL_NOW, 0);
 			local->_96 = local->_ac ? 55 : 54;
 			break;
@@ -1719,7 +1719,7 @@ static void room_203_parser() {
 	if (global[player_selected_object] >= 0) {
 		if (global[player_selected_object] == 5) {
 			if (global[g046] != 0) {
-				// TODO: display_interface()
+				clear_selected_item();
 			} else {
 				player.commands_allowed = false;
 				kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
@@ -1737,7 +1737,7 @@ static void room_203_parser() {
 			}
 		} else if (global[player_selected_object] == 8) {
 			if (global[g046] != 0) {
-				// TODO: display_interface()
+				clear_selected_item();
 			} else {
 				player.commands_allowed = false;
 				kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;