[Scummvm-git-logs] scummvm master -> 56bde4e5cfd4523a47c13d405119af98b9df043f

dreammaster noreply at scummvm.org
Wed Feb 21 06:03:34 UTC 2024


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:
56bde4e5cf M4: Fix Main Menu button in classic options dialog


Commit: 56bde4e5cfd4523a47c13d405119af98b9df043f
    https://github.com/scummvm/scummvm/commit/56bde4e5cfd4523a47c13d405119af98b9df043f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-20T22:03:28-08:00

Commit Message:
M4: Fix Main Menu button in classic options dialog

Changed paths:
    engines/m4/burger/gui/game_menu.cpp


diff --git a/engines/m4/burger/gui/game_menu.cpp b/engines/m4/burger/gui/game_menu.cpp
index 56015cbadfc..f363b1d56ba 100644
--- a/engines/m4/burger/gui/game_menu.cpp
+++ b/engines/m4/burger/gui/game_menu.cpp
@@ -2655,7 +2655,6 @@ void cb_Game_Main(void *, void *) {
 	DestroyGameMenu();
 
 	if (!_GM(gameMenuFromMain)) {
-
 		// Save the game so we can resume from here if possible
 		if (_GM(interfaceWasVisible) && player_commands_allowed()) {
 			other_save_game_for_resurrection();
@@ -2670,9 +2669,8 @@ void cb_Game_Main(void *, void *) {
 		menu_Shutdown(true);
 	}
 
-	// Go to the main menu in room 494
-	_G(game).new_section = 4;
-	_G(game).new_room = 494;
+	// Go to the main menu
+	_G(game).setRoom(_G(executing) == WHOLE_GAME ? 903 : 901);
 }
 
 void cb_Game_Options(void *, void *) {




More information about the Scummvm-git-logs mailing list