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

[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:
eb2331b426 M4: Remove unneeded demo menu items


Commit: eb2331b4268fe1d635e97a32037675fd9871ac1e
    https://github.com/scummvm/scummvm/commit/eb2331b4268fe1d635e97a32037675fd9871ac1e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-15T10:52:39-08:00

Commit Message:
M4: Remove unneeded demo menu items

Changed paths:
    engines/m4/burger/rooms/section9/room901.cpp


diff --git a/engines/m4/burger/rooms/section9/room901.cpp b/engines/m4/burger/rooms/section9/room901.cpp
index 04eeffd51c8..4ae894d5a68 100644
--- a/engines/m4/burger/rooms/section9/room901.cpp
+++ b/engines/m4/burger/rooms/section9/room901.cpp
@@ -40,10 +40,8 @@ enum {
 	MENU_EXIT = 9
 };
 
-static const MenuButtonDef DEMO_BUTTONS[4] = {
-	{ 337, 82, 622, 140, 0, 1, 2, 3, BTNSTATE_ENABLED, 3 },
+static const MenuButtonDef DEMO_BUTTONS[2] = {
 	{ 337, 138, 622, 197, 4, 5, 6, 7, BTNSTATE_ENABLED, 6 },
-	{ 337, 198, 622, 256, 8, 9, 10, 11, BTNSTATE_ENABLED, 5 },
 	{ 337, 260, 622, 317, 12, 13, 14, 15, BTNSTATE_ENABLED, 9 }
 };
 
@@ -63,7 +61,7 @@ void Room901::init() {
 	case JUST_OVERVIEW:
 	case INTERACTIVE_DEMO:
 	case MAGAZINE_DEMO:
-		setButtons(DEMO_BUTTONS, 4);
+		setButtons(DEMO_BUTTONS, 2);
 		series_play("901order", 0, 0, -1, 60, -1, 100, 165, 395, 0, -1);
 		break;
 
@@ -97,13 +95,8 @@ void Room901::daemon() {
 		break;
 
 	case MENU_3:
-		if (g_engine->isDemo()) {
-			warning("This option is not available under ScummVM");
-			_G(game).setRoom(601);
-		} else {
-			player_set_commands_allowed(false);
-			pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 0, 30, 9005);
-		}
+		player_set_commands_allowed(false);
+		pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 0, 30, 9005);
 		break;
 
 	case MENU_4:
@@ -113,14 +106,9 @@ void Room901::daemon() {
 
 	case MENU_5:
 	case MENU_8:
-		if (g_engine->isDemo()) {
-			warning("This option is not available under ScummVM");
-			_G(game).setRoom(601);
-		} else {
-			_G(room902Flag) = _G(kernel).trigger == 8;
-			player_set_commands_allowed(false);
-			pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 0, 30, 9002);
-		}
+		_G(room902Flag) = _G(kernel).trigger == 8;
+		player_set_commands_allowed(false);
+		pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 0, 30, 9002);
 		break;
 
 	case MENU_RESTARTING: