[Scummvm-git-logs] scummvm master -> 06e9351bd2f8b596eef15f56418625c5fa1bbbda

[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:
06e9351bd2 M4: Failing test in demo immediately restarts it


Commit: 06e9351bd2f8b596eef15f56418625c5fa1bbbda
    https://github.com/scummvm/scummvm/commit/06e9351bd2f8b596eef15f56418625c5fa1bbbda
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-22T19:05:07-08:00

Commit Message:
M4: Failing test in demo immediately restarts it

Changed paths:
    engines/m4/burger/burger.cpp
    engines/m4/burger/flags.cpp


diff --git a/engines/m4/burger/burger.cpp b/engines/m4/burger/burger.cpp
index fa4753dc510..bcf16e29491 100644
--- a/engines/m4/burger/burger.cpp
+++ b/engines/m4/burger/burger.cpp
@@ -767,7 +767,8 @@ void BurgerEngine::wilburTeleported() {
 	}
 
 	if (_G(executing) != WHOLE_GAME) {
-		_G(game).setRoom(901);
+		_G(flags).reset2();
+		_G(game).setRoom(604);
 	} else {
 		if (_G(flags)[kFifthTestPassed]) {
 			testDone5();
diff --git a/engines/m4/burger/flags.cpp b/engines/m4/burger/flags.cpp
index bfdd6c5d6e5..2eb262fcfe8 100644
--- a/engines/m4/burger/flags.cpp
+++ b/engines/m4/burger/flags.cpp
@@ -248,6 +248,7 @@ void Flags::reset2() {
 	(*this)[V278] = 0;
 
 	if (_G(executing) != WHOLE_GAME) {
+		inv_move_object("RAY GUN", NOWHERE);
 		inv_give_to_player("BLOCK OF ICE");
 		inv_give_to_player("PANTYHOSE");
 	}