[Scummvm-git-logs] scummvm master -> 68127e8fd11e150a421463af2dc0d1456356f994

[dreammaster]

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

Summary:
9331e68f1c M4: Change field to _wilburMode in room 801
68127e8fd1 M4: Fix background monitors animation in room 801


Commit: 9331e68f1c95a202d00ebb041cff9f1c76ebc676
    https://github.com/scummvm/scummvm/commit/9331e68f1c95a202d00ebb041cff9f1c76ebc676
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-03T21:23:35-08:00

Commit Message:
M4: Change field to _wilburMode in room 801

Changed paths:
    engines/m4/burger/rooms/section8/room801.cpp
    engines/m4/burger/rooms/section8/room801.h


diff --git a/engines/m4/burger/rooms/section8/room801.cpp b/engines/m4/burger/rooms/section8/room801.cpp
index 270371dce36..d20c050cbb4 100644
--- a/engines/m4/burger/rooms/section8/room801.cpp
+++ b/engines/m4/burger/rooms/section8/room801.cpp
@@ -131,7 +131,7 @@ void Room801::init() {
 	player_set_commands_allowed(false);
 	pal_fade_set_start(0);
 	pal_fade_init(_G(kernel).first_fade, 255, 0, 0, -1);
-	_val1 = 10;
+	_wilburMode = 10;
 	digi_preload("800_001");
 
 	if (_G(flags)[GLB_TEMP_5] == 1) {
@@ -544,14 +544,14 @@ void Room801::daemon() {
 		break;
 
 	case kCHANGE_WILBUR_ANIMATION:
-		switch (_val1) {
+		switch (_wilburMode) {
 		case 9:
 			switch (_G(wilbur_should)) {
 			case 5:
 			case 6:
 			case 7:
 				_series12 = series_play("804WI04", 0x200, 2, kCHANGE_WILBUR_ANIMATION, 6, 0);
-				_val1 = 11;
+				_wilburMode = 11;
 				break;
 
 			default:
@@ -566,7 +566,7 @@ void Room801::daemon() {
 			case 4:
 			case 7:
 				_series12 = series_play("804WI05", 0x200, 2, kCHANGE_WILBUR_ANIMATION, 6, 0);
-				_val1 = 11;
+				_wilburMode = 11;
 				break;
 
 			case 5:
@@ -593,13 +593,13 @@ void Room801::daemon() {
 			switch (_G(wilbur_should)) {
 			case 4:
 				_series12 = series_play("804WI04", 0x200, 0, kCHANGE_WILBUR_ANIMATION, 6, 0);
-				_val1 = 9;
+				_wilburMode = 9;
 				break;
 
 			case 5:
 			case 6:
 				_series12 = series_play("804WI05", 0x200, 0, kCHANGE_WILBUR_ANIMATION, 6, 0);
-				_val1 = 10;
+				_wilburMode = 10;
 				break;
 
 			case 7:
diff --git a/engines/m4/burger/rooms/section8/room801.h b/engines/m4/burger/rooms/section8/room801.h
index c163a79d26e..b785668b742 100644
--- a/engines/m4/burger/rooms/section8/room801.h
+++ b/engines/m4/burger/rooms/section8/room801.h
@@ -42,7 +42,7 @@ private:
 	machine *_series10 = nullptr;
 	machine *_series11 = nullptr;
 	machine *_series12 = nullptr;
-	int _val1 = 10;
+	int _wilburMode = 10;
 	int _val3 = 0;
 
 	int getWilburShould() const;


Commit: 68127e8fd11e150a421463af2dc0d1456356f994
    https://github.com/scummvm/scummvm/commit/68127e8fd11e150a421463af2dc0d1456356f994
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-03T21:26:39-08:00

Commit Message:
M4: Fix background monitors animation in room 801

Changed paths:
    engines/m4/burger/rooms/section8/room801.cpp


diff --git a/engines/m4/burger/rooms/section8/room801.cpp b/engines/m4/burger/rooms/section8/room801.cpp
index d20c050cbb4..d6ba0e17e16 100644
--- a/engines/m4/burger/rooms/section8/room801.cpp
+++ b/engines/m4/burger/rooms/section8/room801.cpp
@@ -650,10 +650,10 @@ int Room801::getWilburShould() const {
 }
 
 void Room801::loadSeries1() {
-	_series5 = series_play("804FX01", 0x400, 0, -1, 10);
-	_series6 = series_play("804FX02", 0x400, 0, -1, 45);
-	_series7 = series_play("804FX03", 0x400, 0, -1, 10);
-	_series8 = series_play("804FX04", 0x400, 0, -1, 10);
+	_series5 = series_play("804FX01", 0x400, 0, -1, 10, -1);
+	_series6 = series_play("804FX02", 0x400, 0, -1, 45, -1);
+	_series7 = series_play("804FX03", 0x400, 0, -1, 10, -1);
+	_series8 = series_play("804FX04", 0x400, 0, -1, 10, -1);
 }
 
 void Room801::loadSeries2() {