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

[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:
d51787e9e4 M4: Support intro & gallery for German demo


Commit: d51787e9e42c3cbcc86485eaf531c680c08c1f7e
    https://github.com/scummvm/scummvm/commit/d51787e9e42c3cbcc86485eaf531c680c08c1f7e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-03-06T08:03:20-08:00

Commit Message:
M4: Support intro & gallery for German demo

Changed paths:
    devtools/create_engine/create_engine.vcxproj
    engines/m4/burger/rooms/section9/room901.cpp
    engines/m4/burger/rooms/section9/room951.cpp


diff --git a/devtools/create_engine/create_engine.vcxproj b/devtools/create_engine/create_engine.vcxproj
index 86dcc050e63..14a9f0580b3 100644
--- a/devtools/create_engine/create_engine.vcxproj
+++ b/devtools/create_engine/create_engine.vcxproj
@@ -42,7 +42,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -159,4 +159,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/engines/m4/burger/rooms/section9/room901.cpp b/engines/m4/burger/rooms/section9/room901.cpp
index 4ae894d5a68..64450482983 100644
--- a/engines/m4/burger/rooms/section9/room901.cpp
+++ b/engines/m4/burger/rooms/section9/room901.cpp
@@ -45,6 +45,13 @@ static const MenuButtonDef DEMO_BUTTONS[2] = {
 	{ 337, 260, 622, 317, 12, 13, 14, 15, BTNSTATE_ENABLED, 9 }
 };
 
+static const MenuButtonDef DEMO_DE_BUTTONS[4] = {
+	{ 337, 82, 622, 140, 0, 1, 2, 3, BTNSTATE_ENABLED, 3 },
+	{ 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, 8 },
+};
+
 static const MenuButtonDef GAME_BUTTONS[2] = {
 	{ 337, 82, 622, 140, 4, 5, 6, 7, BTNSTATE_ENABLED, 6 },
 	{ 337, 138, 622, 197, 12, 13, 14, 15, BTNSTATE_ENABLED, 9 }
@@ -61,7 +68,12 @@ void Room901::init() {
 	case JUST_OVERVIEW:
 	case INTERACTIVE_DEMO:
 	case MAGAZINE_DEMO:
-		setButtons(DEMO_BUTTONS, 2);
+		if (g_engine->getLanguage() == Common::DE_DEU) {
+			setButtons(DEMO_DE_BUTTONS, 4);
+		} else {
+			setButtons(DEMO_BUTTONS, 2);
+		}
+
 		series_play("901order", 0, 0, -1, 60, -1, 100, 165, 395, 0, -1);
 		break;
 
diff --git a/engines/m4/burger/rooms/section9/room951.cpp b/engines/m4/burger/rooms/section9/room951.cpp
index da28fa65c76..d07ee64ab89 100644
--- a/engines/m4/burger/rooms/section9/room951.cpp
+++ b/engines/m4/burger/rooms/section9/room951.cpp
@@ -334,9 +334,14 @@ void Room951::daemon() {
 		digi_stop(2);
 		digi_stop(3);
 
-		digi_preload("951music", -1);
-		digi_play("951music", 1, 255, START_PLANET_X_HILLTOP_A, -1);
-		digi_preload("952music", -1);
+		if (_G(executing) == WHOLE_GAME) {
+			digi_preload("951music", -1);
+			digi_play("951music", 1, 255, START_PLANET_X_HILLTOP_A, -1);
+			digi_preload("952music", -1);
+		} else {
+			// German demo
+			kernel_timing_trigger(120, START_PLANET_X_HILLTOP_A);
+		}
 
 		digi_preload_stream_breaks(planet_x_hilltop_a);
 		digi_preload_stream_breaks(planet_x_low_shot);
@@ -530,10 +535,14 @@ void Room951::daemon() {
 		break;
 
 	case START_35:
-		digi_preload_stream_breaks(break_961a);
-		pal_fade_set_start(_G(master_palette), 0);
-		series_stream_with_breaks(break_961a, "961a", 6, 1, START_36);
-		pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 100, 60, NO_TRIGGER);
+		if (_G(executing) == WHOLE_GAME) {
+			digi_preload_stream_breaks(break_961a);
+			pal_fade_set_start(_G(master_palette), 0);
+			series_stream_with_breaks(break_961a, "961a", 6, 1, START_36);
+			pal_fade_init(_G(master_palette), _G(kernel).first_fade, 255, 100, 60, NO_TRIGGER);
+		} else {
+			_G(game).setRoom(901);
+		}
 		break;
 
 	case START_36:
@@ -619,11 +628,13 @@ void Room951::daemon() {
 		break;
 
 	case START_50:
-		digi_play("952music", 3, 255, -1, -1);
+		if (_G(executing) == WHOLE_GAME)
+			digi_play("952music", 3, 255, -1, -1);
 		break;
 
 	case START_51:
-		digi_play_loop("952music", 3, 255, -1, -1);
+		if (_G(executing) == WHOLE_GAME)
+			digi_play_loop("952music", 3, 255, -1, -1);
 		break;
 
 	case START_52: