[Scummvm-git-logs] scummvm master -> 5ac50d81549289f80405c49749431d4a51b9bc5e

[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:
5ac50d8154 M4: Fix looking at TV in test 4


Commit: 5ac50d81549289f80405c49749431d4a51b9bc5e
    https://github.com/scummvm/scummvm/commit/5ac50d81549289f80405c49749431d4a51b9bc5e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-07T18:11:15-08:00

Commit Message:
M4: Fix looking at TV in test 4

Changed paths:
    engines/m4/burger/burger.cpp
    engines/m4/burger/flags.cpp
    engines/m4/burger/flags.h
    engines/m4/burger/rooms/section5/room506.cpp


diff --git a/engines/m4/burger/burger.cpp b/engines/m4/burger/burger.cpp
index aba9c744ddb..474408f2869 100644
--- a/engines/m4/burger/burger.cpp
+++ b/engines/m4/burger/burger.cpp
@@ -695,7 +695,7 @@ void BurgerEngine::testDone4() {
 	_G(flags)[V213] = 2;
 	_G(flags)[V214] = 0;
 	_G(flags)[V218] = 5003;
-	_G(flags)[V219] = 1;
+	_G(flags)[kTVOnFire] = 1;
 	_G(flags)[V223] = 2;
 	_G(flags)[V224] = 0;
 	_G(flags)[V227] = 1;
diff --git a/engines/m4/burger/flags.cpp b/engines/m4/burger/flags.cpp
index 82883dcad87..f8d3559e09a 100644
--- a/engines/m4/burger/flags.cpp
+++ b/engines/m4/burger/flags.cpp
@@ -310,7 +310,7 @@ void Flags::reset4() {
 	inv_move_object("DIRTY SOCK", 504);
 
 	(*this)[V218] = 5000;
-	(*this)[V219] = 0;
+	(*this)[kTVOnFire] = 0;
 	(*this)[V223] = 0;
 	(*this)[V224] = 0;
 
diff --git a/engines/m4/burger/flags.h b/engines/m4/burger/flags.h
index 0c57311ccc6..52a4af9caaf 100644
--- a/engines/m4/burger/flags.h
+++ b/engines/m4/burger/flags.h
@@ -253,7 +253,7 @@ enum {
 	V216 = 216,
 	V217 = 217,
 	V218 = 218,
-	V219 = 219,
+	kTVOnFire = 219,
 	V220 = 220,
 	V221 = 221,
 	V222 = 222,
diff --git a/engines/m4/burger/rooms/section5/room506.cpp b/engines/m4/burger/rooms/section5/room506.cpp
index f113b65ac2f..024b2560533 100644
--- a/engines/m4/burger/rooms/section5/room506.cpp
+++ b/engines/m4/burger/rooms/section5/room506.cpp
@@ -127,18 +127,18 @@ void Room506::init() {
 	for (_ctr = 0; _ctr < 5; ++_ctr)
 		_triggers[_ctr] = -1;
 
-	if (_G(flags)[V219]) {
+	if (_G(flags)[kTVOnFire]) {
 		kernel_trigger_dispatch_now(12);
 	} else {
 		hotspot_set_active("FIRE", false);
 	}
 
-	if (_G(flags)[V219] == 0) {
+	if (_G(flags)[kTVOnFire] == 0) {
 		_val1 = 19;
 		kernel_trigger_dispatch_now(10);
 	}
 
-	if (_G(flags)[V219]) {
+	if (_G(flags)[kTVOnFire]) {
 		series_show("506windo", 0xf00);
 	} else {
 		hotspot_set_active("ROOF", false);
@@ -352,7 +352,7 @@ void Room506::daemon() {
 		break;
 
 	case 12:
-		_G(flags)[V219] = 1;
+		_G(flags)[kTVOnFire] = 1;
 		terminateMachineAndNull(_series1);
 		hotspot_set_active("JOYSTICK", false);
 		hotspot_set_active("FIRE", true);
@@ -361,7 +361,7 @@ void Room506::daemon() {
 
 	case 13:
 		series_show("506windo", 0xf00);
-		_G(flags)[V219] = 1;
+		_G(flags)[kTVOnFire] = 1;
 		hotspot_set_active("ROOF", true);
 		break;
 
@@ -469,13 +469,13 @@ void Room506::pre_parser() {
 void Room506::parser() {
 	_G(kernel).trigger_mode = KT_DAEMON;
 
-	if (player_said("GEAR") && player_said_any("WINDOW", "ROOF") && !_G(flags)[V219]) {
+	if (player_said("GEAR") && player_said_any("WINDOW", "ROOF") && !_G(flags)[kTVOnFire]) {
 		wilbur_speech("500w004");
-	} else if (player_said("TELEVISION") && player_said("LOOK AT")) {
+	} else if (_G(flags)[kTVOnFire] && player_said("TELEVISION") && player_said("LOOK AT")) {
 		wilbur_speech("506w006");
-	} else if (player_said("TELEVISION") && player_said("GEAR")) {
+	} else if (_G(flags)[kTVOnFire] && player_said("TELEVISION") && player_said("GEAR")) {
 		wilbur_speech("506w008");
-	} else if (_G(flags)[V219] != 0 && player_said("VIDEO GAME") &&
+	} else if (_G(flags)[kTVOnFire] && player_said("VIDEO GAME") &&
 			player_said_any("TAKE", "GEAR")) {
 		// No implementation
 	} else if (_G(walker).wilbur_said(SAID)) {
@@ -487,7 +487,7 @@ void Room506::parser() {
 		_val2 = 15;
 		++_state2;
 	} else if (player_said_any("ROOF", "WINDOW") && player_said_any("ENTER", "GEAR") &&
-			_G(flags)[V219]) {
+			_G(flags)[kTVOnFire]) {
 		_G(wilbur_should) = 2;
 		kernel_trigger_dispatch_now(kCHANGE_WILBUR_ANIMATION);
 	} else if (player_said("HALLWAY") && player_said_any("LEAVE", "LOOK AT", "GEAR")) {