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

[Strangerke]

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:
de86cd5004 M4: RIDDLE: Fix bug #15956 and add a little comment on the flag 84


Commit: de86cd50048eb79fd7a7b87eacf691e22d89d27b
    https://github.com/scummvm/scummvm/commit/de86cd50048eb79fd7a7b87eacf691e22d89d27b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-01T06:41:48+01:00

Commit Message:
M4: RIDDLE: Fix bug #15956 and add a little comment on the flag 84

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


diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index dea6cedf93c..77ae80c8778 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -116,7 +116,7 @@ enum Flag {
 	V081 =  81, // Room 303 Torso Tomato : first look animation played
 	V082 =  82,
 	V083 =  83,
-	V084 =  84,
+	V084 =  84, // Room 304: 1 if cobra is dead, 2 if cobra has been caught alive
 	V085 =  85,
 	V086 =  86,
 	V087 =  87,
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 0b3f237c563..32e9188380d 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -72,12 +72,12 @@ void Room304::init() {
 		player_set_commands_allowed(false);
 		ws_demand_location(_G(my_walker), 458, 263, 8);
 
-		if (_G(flags)[V084] == 2 || player_been_here(201)) {
+		if (_G(flags)[V084] == 2 || player_been_here(201))
 			_sword = series_show_sprite("one frame sword", 0, 0xa00);
-			kernel_timing_trigger(1, 51);
-		} else {
+		else
 			hotspot_set_active("SAMURAI SWORD", false);
-		}
+
+		kernel_timing_trigger(1, 51);
 		break;
 
 	default: