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

[sluicebox]

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

Summary:
89dd781e23 SCI32: Disable speed test in RAMA Demo
962660cd54 SCI32: Add RAMA Demo to fallback detection
f672647934 SCI32: Add detection entry for RAMA Demo variant


Commit: 89dd781e2302cf0c96d5ffa7cb197e37119cd406
    https://github.com/scummvm/scummvm/commit/89dd781e2302cf0c96d5ffa7cb197e37119cd406
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-01-19T13:50:54-08:00

Commit Message:
SCI32: Disable speed test in RAMA Demo

Changed paths:
    engines/sci/engine/script_patches.cpp


diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 2bdcdfeae3e..067bb3df2cf 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -23495,6 +23495,7 @@ static const uint16 ramaDemoBrokenButtonsPatch[] = {
 
 static const SciScriptPatcherEntry ramaSignatures[] = {
 	{  true,     0, "disable video benchmarking",                     1, sci2BenchmarkSignature,          sci2BenchmarkReversePatch },
+	{  true,    12, "disable video benchmarking",                     1, sci2BenchmarkSignature,          sci2BenchmarkReversePatch },
 	{  true,    15, "disable video benchmarking",                     1, sci2BenchmarkSignature,          sci2BenchmarkReversePatch },
 	{  true,    55, "fix bad DocReader::init priority calculation",   1, ramaDocReaderInitSignature,      ramaDocReaderInitPatch },
 	{  true,    85, "fix SaveManager to use normal readWord calls",   1, ramaSerializeRegTSignature1,     ramaSerializeRegTPatch1 },


Commit: 962660cd54ae29aa8a0b1948d48c0c789aad55bd
    https://github.com/scummvm/scummvm/commit/962660cd54ae29aa8a0b1948d48c0c789aad55bd
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-01-19T13:50:54-08:00

Commit Message:
SCI32: Add RAMA Demo to fallback detection

Changed paths:
    engines/sci/metaengine.cpp


diff --git a/engines/sci/metaengine.cpp b/engines/sci/metaengine.cpp
index b42d0544790..2e16f2c4e2b 100644
--- a/engines/sci/metaengine.cpp
+++ b/engines/sci/metaengine.cpp
@@ -55,7 +55,7 @@ static const GameIdStrToEnum s_gameIdStrToEnum[] = {
 	{ "camelot",         "arthur",          GID_CAMELOT,          false, SCI_VERSION_NONE },
 	{ "castlebrain",     "brain",           GID_CASTLEBRAIN,      false, SCI_VERSION_1_LATE },	// Amiga is SCI1 middle, PC SCI1 late
 	{ "chest",           "archive",         GID_CHEST,            true,  SCI_VERSION_NONE },
-	{ "christmas1988",   "demo",            GID_CHRISTMAS1988,    false, SCI_VERSION_NONE },
+	{ "christmas1988",   "demo",            GID_CHRISTMAS1988,    false, SCI_VERSION_0_EARLY },
 	{ "christmas1990",   "card",            GID_CHRISTMAS1990,    false, SCI_VERSION_1_EARLY },
 	{ "christmas1992",   "card",            GID_CHRISTMAS1992,    false, SCI_VERSION_1_1 },
 	{ "cnick-kq",        "",                GID_CNICK_KQ,         false, SCI_VERSION_NONE },	// Sierra ID is "hoyle3", distinguished by resource count
@@ -149,6 +149,7 @@ static const DemoIdEntry s_demoIdTable[] = {
 	{ "ll5",       "lsl5" },
 	{ "hq",        "qfg1" },	// QFG1 SCI0/EGA
 	{ "hq2demo",   "qfg2" },
+	{ "demo",      "rama" },
 	{ "sq1demo",   "sq1sci" },
 	{ nullptr,      nullptr }
 };


Commit: f67264793407a20ba8d7187abc0417a356d1269f
    https://github.com/scummvm/scummvm/commit/f67264793407a20ba8d7187abc0417a356d1269f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-01-19T13:50:54-08:00

Commit Message:
SCI32: Add detection entry for RAMA Demo variant

Thanks to @einstein95 for finding this

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 22ebff1cb8f..5381a68b78e 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -5010,6 +5010,14 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_RAMA_DEMO },
 
+	// RAMA - English DOS/Windows Demo
+	// Executable scanning reports "2.100.002", VERSION file reports "00.001.000"
+	{"rama", "Demo", {
+		{"resmap.001", 0, "13f48e8f8a8860f832589b4657107011", 1459},
+		{"ressci.001", 0, "2a45964695196795837b434588003a40", 2318114},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_RAMA_DEMO },
+
 	// RAMA - English DOS/Windows (from jvprat)
 	// Executable scanning reports "3.000.000", VERSION file reports "1.100.000"
 	{"rama", "", {