[Scummvm-git-logs] scummvm master -> 5a29939862ecbbfb13299fbe2532f4c74f61a4cc

[dreammaster]

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

Summary:
36f59085fd MADS: PHANTOM: Fix type of Speech display_condition
5a29939862 MADS: PHANTOM: Add animview breakout if quitting ScummVM


Commit: 36f59085fde8e015c6e8414daab7d78e29639c54
    https://github.com/scummvm/scummvm/commit/36f59085fde8e015c6e8414daab7d78e29639c54
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T18:56:58+10:00

Commit Message:
MADS: PHANTOM: Fix type of Speech display_condition

Changed paths:
    engines/mads/madsv2/core/anim.h


diff --git a/engines/mads/madsv2/core/anim.h b/engines/mads/madsv2/core/anim.h
index 2833bccf8e8..2385b8bba9a 100644
--- a/engines/mads/madsv2/core/anim.h
+++ b/engines/mads/madsv2/core/anim.h
@@ -315,7 +315,7 @@ struct Speech {
 	byte sound;                   /* Sound to be used         */
 	Audio::AudioStream *speech;	  /* Speech audio stream      */
 	int16 x, y;                   /* Text coordinates         */
-	int16 display_condition;      /* Condition for display    */
+	uint16 display_condition;     /* Condition for display    */
 	RGBcolor color[2];            /* Colors for text display  */
 	word flags;                   /* Segment flags            */
 	int16 speech_loops;           /* Loops if speech active   */


Commit: 5a29939862ecbbfb13299fbe2532f4c74f61a4cc
    https://github.com/scummvm/scummvm/commit/5a29939862ecbbfb13299fbe2532f4c74f61a4cc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T18:56:58+10:00

Commit Message:
MADS: PHANTOM: Add animview breakout if quitting ScummVM

Changed paths:
    engines/mads/madsv2/animview/animview.cpp


diff --git a/engines/mads/madsv2/animview/animview.cpp b/engines/mads/madsv2/animview/animview.cpp
index 5100adfc3a7..0dee9579f78 100644
--- a/engines/mads/madsv2/animview/animview.cpp
+++ b/engines/mads/madsv2/animview/animview.cpp
@@ -358,7 +358,7 @@ static void animate() {
 	matte_init(-1);
 
 	// Preload resources used by the animations
-	for (count = 0; count < anim_count && !error_code; ++count) {
+	for (count = 0; count < anim_count; ++count) {
 		AnimEntry &entry = anim_list[count];
 
 		MADS_FORMAT(buf, entry.name);
@@ -399,7 +399,7 @@ static void animate() {
 
 	speech_init();
 
-	for (count = 0; count < anim_count; ++count) {
+	for (count = 0; count < anim_count && !error_code; ++count) {
 		MADS_FORMAT(buf, anim_list[count].name);
 
 		foundSound = false;
@@ -527,6 +527,9 @@ static void animate() {
 		buffer_free(&scr_work);
 		anim_unload(current_anim);
 		current_anim = nullptr;
+
+		if (g_engine->shouldQuit())
+			error_code = 1;
 	}
 done:
 	timer_activate_low_priority(nullptr);