[Scummvm-git-logs] scummvm master -> 4c73bfa462072e2fdf8558218fc09de2f1f69a40

[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:
4c73bfa462 M4: Fix mouth animations in room 706


Commit: 4c73bfa462072e2fdf8558218fc09de2f1f69a40
    https://github.com/scummvm/scummvm/commit/4c73bfa462072e2fdf8558218fc09de2f1f69a40
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-13T20:23:45-08:00

Commit Message:
M4: Fix mouth animations in room 706

Changed paths:
    engines/m4/burger/rooms/section7/room706.cpp
    engines/m4/burger/rooms/section7/room706.h


diff --git a/engines/m4/burger/rooms/section7/room706.cpp b/engines/m4/burger/rooms/section7/room706.cpp
index 26736928eec..feabf71ae23 100644
--- a/engines/m4/burger/rooms/section7/room706.cpp
+++ b/engines/m4/burger/rooms/section7/room706.cpp
@@ -27,6 +27,10 @@ namespace M4 {
 namespace Burger {
 namespace Rooms {
 
+enum {
+	kCHANGE_ASTRAL_ANIMATION = 33
+};
+
 static const seriesStreamBreak SERIES1[] = {
 	{   0, "706F001",  1, 255, -1, 0, nullptr, 0 },
 	{  31, "706W001",  1, 255, -1, 0, nullptr, 0 }, 
@@ -428,14 +432,14 @@ void Room706::daemon() {
 		kernel_timing_trigger(6, 42);
 		break;
 
-	case 33:
-		switch (_val1) {
+	case kCHANGE_ASTRAL_ANIMATION:
+		switch (_astralShould) {
 		case 1:
-			_val1 = 21;
+			_astralShould = 21;
 			_flag7 = true;
-			_series7 = series_play("706AST01", 0x300);
-			_series8 = series_play("706AST02", 0x300);
-			digi_play(conv_sound_to_play(), 1, 255, 33);
+			_series7 = series_play("706AST01", 0x300, 0, -1, 6, -1);
+			_series8 = series_play("706AST02", 0x300, 0, -1, 6, -1);
+			digi_play(conv_sound_to_play(), 1, 255, kCHANGE_ASTRAL_ANIMATION);
 			break;
 
 		case 21:
@@ -518,7 +522,7 @@ void Room706::daemon() {
 		case 1:
 			_G(wilbur_should) = 21;
 			_flag6 = true;
-			_series6 = series_play("706WIT01", 0x200);
+			_series6 = series_play("706WIT01", 0x200, 0, -1, 6, -1);
 			digi_play(conv_sound_to_play(), 1, 255, kCHANGE_WILBUR_ANIMATION);
 			break;
 
@@ -555,8 +559,8 @@ void Room706::conv83() {
 		int who = conv_whos_talking();
 
 		if (who <= 0) {
-			_val1 = 1;
-			kernel_trigger_dispatch_now(33);
+			_astralShould = 1;
+			kernel_trigger_dispatch_now(kCHANGE_ASTRAL_ANIMATION);
 
 		} else if (who == 1) {
 			_G(wilbur_should) = 1;
diff --git a/engines/m4/burger/rooms/section7/room706.h b/engines/m4/burger/rooms/section7/room706.h
index fc9e926f848..917c188cef2 100644
--- a/engines/m4/burger/rooms/section7/room706.h
+++ b/engines/m4/burger/rooms/section7/room706.h
@@ -42,7 +42,7 @@ private:
 	bool _flag6 = false;
 	bool _flag7 = false;
 	int _volume = 0;
-	int _val1 = 0;
+	int _astralShould = 0;
 
 	void conv83();
 	void getRoomVal();