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

dreammaster noreply at scummvm.org
Thu Jan 25 02:51:04 UTC 2024


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
69de7c1d35 M4: Mark French version for testing again
c599692421 M4: Fix crash in Barbershop playing null sound


Commit: 69de7c1d353de1d16988b715dfe226e5cc5272aa
    https://github.com/scummvm/scummvm/commit/69de7c1d353de1d16988b715dfe226e5cc5272aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-24T18:50:57-08:00

Commit Message:
M4: Mark French version for testing again

Changed paths:
    engines/m4/detection_tables.h


diff --git a/engines/m4/detection_tables.h b/engines/m4/detection_tables.h
index 0062213e8c8..420fefef894 100644
--- a/engines/m4/detection_tables.h
+++ b/engines/m4/detection_tables.h
@@ -42,7 +42,6 @@ static const M4GameDescription gameDescriptions[] = {
 		GType_Burger,
 		kFeaturesCD
 	},
-	// TODO: Currently French version crashes on start up. Still to be investigated
 	{
 		{
 			"burger",
@@ -50,7 +49,7 @@ static const M4GameDescription gameDescriptions[] = {
 			AD_ENTRY1s("burger.has", "3887c30f0d2f93fed7549120748c07fd", 724755),
 			Common::FR_FRA,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GType_Burger,


Commit: c5996924216e2be1271cc06b3e87bda8111be6e9
    https://github.com/scummvm/scummvm/commit/c5996924216e2be1271cc06b3e87bda8111be6e9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-24T18:50:57-08:00

Commit Message:
M4: Fix crash in Barbershop playing null sound

Changed paths:
    engines/m4/burger/rooms/section1/room102.cpp


diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index 9cab2717615..ae1bb4c6f00 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -1445,7 +1445,7 @@ const char *Room102::getDigi1(int num) const {
 
 const char *Room102::getDigi2(int num) const {
 	static const char *NAMES[35] = {
-		"102_011", "102_004", nullptr,   "102_006", "102_008",
+		"102_011", "102_004", "102_024", "102_006", "102_008",
 		"102_009", "102_013", "102_005", "102_014", "102_023",
 		"102_020", "102_011", "102_015", "102_006", "102_007",
 		"102_016", "102_014", "102_015", "102_013", "102_011",




More information about the Scummvm-git-logs mailing list