[Scummvm-git-logs] scummvm master -> 81ba0b0b70c9c3496a7fff65bc8fd5bddf9912dc

[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:
81ba0b0b70 M4: Hook up demo menu options for Intro/Gallery to go to game


Commit: 81ba0b0b70c9c3496a7fff65bc8fd5bddf9912dc
    https://github.com/scummvm/scummvm/commit/81ba0b0b70c9c3496a7fff65bc8fd5bddf9912dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-12T19:56:08-08:00

Commit Message:
M4: Hook up demo menu options for Intro/Gallery to go to game

They were previously crashing due to missing code, and I don't
want to go to the effort of implementing them. The important
thing is that the interative part of the demo itself works.

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 39d55766744..215720c7768 100644
--- a/engines/m4/burger/rooms/section9/room901.cpp
+++ b/engines/m4/burger/rooms/section9/room901.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section9/room901.h"
 #include "m4/graphics/gr_series.h"
 #include "m4/burger/vars.h"
+#include "m4/burger/burger.h"
 
 namespace M4 {
 namespace Burger {
@@ -95,8 +96,13 @@ void Room901::daemon() {
 		break;
 
 	case MENU_3:
-		player_set_commands_allowed(false);
-		pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 0, 30, 9005);
+		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);
+		}
 		break;
 
 	case MENU_4:
@@ -106,9 +112,14 @@ void Room901::daemon() {
 
 	case MENU_5:
 	case MENU_8:
-		_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);
+		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);
+		}
 		break;
 
 	case MENU_RESTARTING: