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

[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:
a2ed8657d5 M4: Fix crash melting ice in middle/upper cage floors in demo


Commit: a2ed8657d5cf2b9360dec727201cad3e79b1dc9c
    https://github.com/scummvm/scummvm/commit/a2ed8657d5cf2b9360dec727201cad3e79b1dc9c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-15T17:32:54-10:00

Commit Message:
M4: Fix crash melting ice in middle/upper cage floors in demo

Changed paths:
    engines/m4/burger/rooms/section6/section6.cpp


diff --git a/engines/m4/burger/rooms/section6/section6.cpp b/engines/m4/burger/rooms/section6/section6.cpp
index 4fa818bc4c3..8ba7d93c771 100644
--- a/engines/m4/burger/rooms/section6/section6.cpp
+++ b/engines/m4/burger/rooms/section6/section6.cpp
@@ -293,7 +293,8 @@ void Section6::daemon() {
 				_state1 = 6001;
 				_G(wilbur_should) = 6002;
 				_G(flags)[V244] = 10028;
-				series_play_with_breaks(PLAY1, "602melt", 0x999, kCHANGE_WILBUR_ANIMATION, 3);
+				series_play_with_breaks(PLAY1, "602melt", 0x999, kCHANGE_WILBUR_ANIMATION,
+					WITH_SHADOW | PRELOAD_SOUNDS);
 				break;
 
 			case 603:
@@ -301,7 +302,8 @@ void Section6::daemon() {
 				_state1 = 6001;
 				_G(wilbur_should) = 6002;
 				_G(flags)[V244] = 10029;
-				series_play_with_breaks(PLAY1, "603melt", 0x999, kCHANGE_WILBUR_ANIMATION, 3);
+				series_play_with_breaks(PLAY1, "603melt", 0x999, kCHANGE_WILBUR_ANIMATION,
+					_G(executing) == WHOLE_GAME ? WITH_SHADOW | PRELOAD_SOUNDS : PRELOAD_SOUNDS);
 				break;
 
 			case 604:
@@ -313,7 +315,9 @@ void Section6::daemon() {
 					ws_hide_walker();
 					_state1 = 6001;
 					_G(wilbur_should) = 6002;
-					series_play_with_breaks(PLAY1, "604melt", 0x999, kCHANGE_WILBUR_ANIMATION, 3);
+					series_play_with_breaks(PLAY1, "604melt", 0x999, kCHANGE_WILBUR_ANIMATION,
+						_G(executing) == WHOLE_GAME ? WITH_SHADOW | PRELOAD_SOUNDS : PRELOAD_SOUNDS);
+
 				}
 				break;