[Scummvm-git-logs] scummvm master -> 97397d70498465d7ce467e6392a1df7adca186b0

[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:
97397d7049 M4: Fix disappearing fan & chain in test 4


Commit: 97397d70498465d7ce467e6392a1df7adca186b0
    https://github.com/scummvm/scummvm/commit/97397d70498465d7ce467e6392a1df7adca186b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-07T21:44:19-08:00

Commit Message:
M4: Fix disappearing fan & chain in test 4

Changed paths:
    engines/m4/burger/rooms/section5/room505.cpp
    engines/m4/burger/rooms/section5/room505.h
    engines/m4/burger/rooms/section5/room507.cpp
    engines/m4/burger/rooms/section5/room507.h


diff --git a/engines/m4/burger/rooms/section5/room505.cpp b/engines/m4/burger/rooms/section5/room505.cpp
index 11fb9d67981..23cde0a3537 100644
--- a/engines/m4/burger/rooms/section5/room505.cpp
+++ b/engines/m4/burger/rooms/section5/room505.cpp
@@ -198,9 +198,11 @@ void Room505::daemon() {
 			break;
 
 		case 7:
-			terminateMachineAndNull(_series1);
+			terminateMachineAndNull(_fan);
 			_borkState = 8;
-			_borkStairs.play("505bk01", 0xbff, 0, 4, 6, 0, 100, 0, 0, 10, 24);
+			_borkStairs[0] = series_play("505bk01", 0xbff, 0, 4, 6, 0, 100, 0, 0, 10, 24);
+			_borkStairs[1] = series_play("505bk01s", 0xc00, 0, 7, 6, 0, 100, 0, 0, 10, 24);
+
 			_val4 = 1;
 			kernel_trigger_dispatch_now(5);
 			break;
@@ -252,7 +254,7 @@ void Room505::daemon() {
 		break;
 
 	case 7:
-		_series1 = series_play("505fan", 0xbff);
+		_fan = series_play("505fan", 0xbff, 0, -1, 6, -1);
 		break;
 
 	case kCHANGE_WILBUR_ANIMATION:
diff --git a/engines/m4/burger/rooms/section5/room505.h b/engines/m4/burger/rooms/section5/room505.h
index 2457891cea7..4880502b3d9 100644
--- a/engines/m4/burger/rooms/section5/room505.h
+++ b/engines/m4/burger/rooms/section5/room505.h
@@ -39,7 +39,7 @@ private:
 	int _destTrigger = 0;
 	int _val3 = 0;
 	int _val4 = 0;
-	machine *_series1 = nullptr;
+	machine *_fan = nullptr;
 
 public:
 	Room505();
diff --git a/engines/m4/burger/rooms/section5/room507.cpp b/engines/m4/burger/rooms/section5/room507.cpp
index 37650cd5226..9ad05c19247 100644
--- a/engines/m4/burger/rooms/section5/room507.cpp
+++ b/engines/m4/burger/rooms/section5/room507.cpp
@@ -416,7 +416,7 @@ void Room507::daemon() {
 			_val2 = 24;
 			_triggers[0] = 6;
 			_itemNum = 1;
-			_val8 = 11;
+			_triggers[1] = 11;
 			_state1 = imath_ranged_rand(1, 2);
 			_state2 = imath_ranged_rand(1, 2);
 			_state3 = imath_ranged_rand(1, 2);
@@ -525,8 +525,8 @@ void Room507::daemon() {
 			_val1 = 13;
 			_triggers[0] = 3;
 			_val3 = 31;
-			_val8 = 9;
-			_val9 = 10;
+			_triggers[1] = 11;
+			_triggers[2] = 10;
 			terminateMachineAndNull(_series3);
 			series_play_with_breaks(PLAY15, "507bk09", 0x8ff, 1, 2);
 			break;
@@ -652,7 +652,7 @@ void Room507::daemon() {
 			}
 
 			_triggers[0] = kCHANGE_WILBUR_ANIMATION;
-			_val8 = 10;
+			_triggers[1] = 10;
 			series_play_with_breaks(PLAY7, "507wi05", 0x8ff, 1, 3);
 			break;
 
diff --git a/engines/m4/burger/rooms/section5/room507.h b/engines/m4/burger/rooms/section5/room507.h
index 59d119d4977..bfd45f426bd 100644
--- a/engines/m4/burger/rooms/section5/room507.h
+++ b/engines/m4/burger/rooms/section5/room507.h
@@ -69,8 +69,6 @@ private:
 	int _val5 = 0;
 	int _val6 = 0;
 	int _itemNum = 0;
-	int _val8 = 0;
-	int _val9 = 0;
 
 	void loadSeries();