From cc1314f9fec1225ed3e7e4fe6c5a930cae88ff51 Mon Sep 17 00:00:00 2001
From: Paul Gilbert <dreammaster@scummvm.org>
Date: Wed, 27 Dec 2023 16:56:34 -1000
Subject: [PATCH] M4: Fix talking to Roxy in test 5

---
 engines/m4/burger/rooms/section4/room407.cpp | 14 +++++++-------
 engines/m4/burger/rooms/section4/room407.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

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;