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

[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:
f78dde2e68 M4: Fix crash in room 407 playing random samples
cc1314f9fe M4: Fix talking to Roxy in test 5


Commit: f78dde2e6812377c3c62ea5cab708e00863ff651
    https://github.com/scummvm/scummvm/commit/f78dde2e6812377c3c62ea5cab708e00863ff651
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-27T16:57:01-10:00

Commit Message:
M4: Fix crash in room 407 playing random samples

Changed paths:
    engines/m4/burger/rooms/section4/room407.cpp


diff --git a/engines/m4/burger/rooms/section4/room407.cpp b/engines/m4/burger/rooms/section4/room407.cpp
index 91fff762e78..3d8b4a30750 100644
--- a/engines/m4/burger/rooms/section4/room407.cpp
+++ b/engines/m4/burger/rooms/section4/room407.cpp
@@ -267,7 +267,7 @@ void Room407::daemon() {
 			if (rnd >= 16)
 				_digiName = "407r902a";
 			else
-				_digiName = Common::String::format("407r902%c", 'a' + imath_ranged_rand(1, 25));
+				_digiName = Common::String::format("407r902%c", 'a' + rnd);
 
 			_flag1 = true;
 			digi_preload(_digiName);


Commit: cc1314f9fec1225ed3e7e4fe6c5a930cae88ff51
    https://github.com/scummvm/scummvm/commit/cc1314f9fec1225ed3e7e4fe6c5a930cae88ff51
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-12-27T16:57:01-10:00

Commit Message:
M4: Fix talking to Roxy in test 5

Changed paths:
    engines/m4/burger/rooms/section4/room407.cpp
    engines/m4/burger/rooms/section4/room407.h


diff --git a/engines/m4/burger/rooms/section4/room407.cpp b/engines/m4/burger/rooms/section4/room407.cpp
index 3d8b4a30750..5e743daf68d 100644
--- a/engines/m4/burger/rooms/section4/room407.cpp
+++ b/engines/m4/burger/rooms/section4/room407.cpp
@@ -260,7 +260,7 @@ void Room407::daemon() {
 	case 5:
 		_drumzShould = 17;
 
-		if (_val4) {
+		if (_roxyState) {
 			kernel_timing_trigger(120, 7);
 		} else {
 			int rnd = imath_ranged_rand(1, 25);
@@ -367,14 +367,14 @@ void Room407::daemon() {
 	case kCHANGE_ROXY_ANIMATION:
 		switch (_roxyShould) {
 		case 22:
-			_val4 = 0;
+			_roxyState = 0;
 			_rx = series_show("407rx02", 0x901);
 			break;
 
 		case 23:
 			terminateMachineAndNull(_rx);
 
-			switch (_val4) {
+			switch (_roxyState) {
 			case 1:
 				_roxyShould = 26;
 				break;
@@ -421,7 +421,7 @@ void Room407::daemon() {
 		case 29:
 			_roxyShould = 22;
 			kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
-			kernel_trigger_dispatch_now(1);
+			player_set_commands_allowed(true);
 			break;
 
 		case 30:
@@ -461,7 +461,7 @@ void Room407::daemon() {
 		switch (_vipeShould) {
 		case 35:
 			_vp02.show("407vp02", 0x300);
-			_val4 = 1;
+			_roxyState = 1;
 			_roxyShould = 23;
 			kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
 			break;
@@ -550,7 +550,7 @@ void Room407::daemon() {
 				kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION);
 			}
 
-			_val4 = 3;
+			_roxyState = 3;
 			_roxyShould = 20;
 			kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
 			break;
@@ -564,7 +564,7 @@ void Room407::daemon() {
 				kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION);
 			}
 
-			_val4 = 2;
+			_roxyState = 2;
 			_roxyShould = 23;
 			kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
 			break;
diff --git a/engines/m4/burger/rooms/section4/room407.h b/engines/m4/burger/rooms/section4/room407.h
index e5ebb8372a2..2512e4a4b34 100644
--- a/engines/m4/burger/rooms/section4/room407.h
+++ b/engines/m4/burger/rooms/section4/room407.h
@@ -62,7 +62,7 @@ private:
 	int _val1 = 0;
 	int _drumzShould = 0;
 	int _roxyShould = 0;
-	int _val4 = 0;
+	int _roxyState = 0;
 	int _vipeShould = 0;
 	//int _digiTrigger = 0;