[Scummvm-git-logs] scummvm master -> 2cd753e7a3f35448cebeb4b342f69a9dc5c0c71f

[neuromancer]

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:
4e472f9abb FREESCAPE: do not show intro in the Driller DOS demo
2cd753e7a3 HYPNO: added support for another wetlands demo


Commit: 4e472f9abb2992867b7397fe578a3041104ed9d0
    https://github.com/scummvm/scummvm/commit/4e472f9abb2992867b7397fe578a3041104ed9d0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-01-10T21:26:20-03:00

Commit Message:
FREESCAPE: do not show intro in the Driller DOS demo

Changed paths:
    engines/freescape/freescape.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index a9c0c277296..80054524438 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -184,9 +184,6 @@ void FreescapeEngine::drawBorder() {
 }
 
 void FreescapeEngine::drawTitle() {
-	if (!_title)
-		return;
-
 	_gfx->setViewport(_fullscreenViewArea);
 	if (isSpectrum()) {
 		Graphics::Surface *title = new Graphics::Surface();
@@ -514,7 +511,8 @@ Common::Error FreescapeEngine::run() {
 	int saveSlot = ConfMan.getInt("save_slot");
 	centerCrossair();
 
-	if (_title) {
+	if (_title && \
+	  !(isDemo() && isDOS() && isDriller())) { // This should be moved to a Driller specific code
 		if (saveSlot == -1) {
 			drawTitle();
 			_gfx->flipBuffer();
@@ -524,7 +522,7 @@ Common::Error FreescapeEngine::run() {
 	}
 
 	loadBorder(); // Border is load unmodified
-	if (_border && (isDOS() || isSpectrum())) {
+	if (_border && ((isDOS() && !isDemo()) || isSpectrum())) { // This should be moved to a Driller specific code
 		if (saveSlot == -1) {
 			drawBorder();
 			_gfx->flipBuffer();


Commit: 2cd753e7a3f35448cebeb4b342f69a9dc5c0c71f
    https://github.com/scummvm/scummvm/commit/2cd753e7a3f35448cebeb4b342f69a9dc5c0c71f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-01-10T21:26:20-03:00

Commit Message:
HYPNO: added support for another wetlands demo

Changed paths:
    engines/hypno/detection.cpp
    engines/hypno/wet/arcade.cpp
    engines/hypno/wet/wet.cpp


diff --git a/engines/hypno/detection.cpp b/engines/hypno/detection.cpp
index 0549b881f07..f200ab0653b 100644
--- a/engines/hypno/detection.cpp
+++ b/engines/hypno/detection.cpp
@@ -152,6 +152,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_DEMO,
 		GUIO1(GUIO_NOMIDI)
 	},
+	{
+		"wetlands", // Might and Magic Trilogy CD (November 1995) - Chapters 31/52 demo
+		"M&MCD",
+		AD_ENTRY2s("wetlands.exe", "15a6b1b3819ef002438df340509b5373", 642231,
+				"missions.lib", "7e3e5b23ade5ef0df88e9d31f5d669e6", 10188),
+		Common::EN_USA,
+		Common::kPlatformDOS,
+		ADGF_DEMO,
+		GUIO1(GUIO_NOMIDI)
+	},
 	{
 		"wetlands", // Non Interactive: PC Review 49 (November 1995)
 		"NonInteractive",
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index ec6bee07906..98998517f6b 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -408,9 +408,9 @@ void WetEngine::runAfterArcade(ArcadeShooting *arc) {
 		}
 	}
 
-	if (isDemo() && _variant != "Demo" && _restoredContentEnabled) {
+	if (isDemo() && _variant != "Demo" && _variant != "M&MCD" && _restoredContentEnabled) {
 		showDemoScore();
-	} else if (!isDemo() || _variant == "Demo" || _variant == "Gen4") {
+	} else if (!isDemo() || _variant == "Demo" || _variant == "M&MCD" || _variant == "Gen4") {
 		byte *palette;
 		Graphics::Surface *frame = decodeFrame("c_misc/zones.smk", 12, &palette);
 		loadPalette(palette, 0, 256);
@@ -555,7 +555,7 @@ void WetEngine::runBeforeArcade(ArcadeShooting *arc) {
 	resetStatistics();
 	_checkpoint = _currentLevel;
 	MVideo *video;
-	if (!isDemo()) {
+	if (!isDemo() || ((_variant == "Demo" || _variant == "M&MCD") && _restoredContentEnabled)) {
 
 		saveProfile(_name, int(arc->id));
 		byte *palette;
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index ebe1033fb09..b397b4f65d1 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -93,7 +93,7 @@ void WetEngine::loadAssets() {
 	}
 	_difficulty = ""; // No difficulty selection in demo
 
-	if (_variant == "Demo" || _variant == "DemoHebrew")
+	if (_variant == "Demo" || _variant == "DemoHebrew" || _variant == "M&MCD")
 		loadAssetsDemoDisc();
 	else if (_variant == "Gen4")
 		loadAssetsGen4();
@@ -110,7 +110,7 @@ void WetEngine::loadAssets() {
 
 void WetEngine::loadAssetsDemoDisc() {
 
-	bool encrypted = _variant == "Demo" ? true : false;
+	bool encrypted = _variant == "Demo" || _variant == "M&MCD" ? true : false;
 	LibFile *missions = loadLib("", "wetlands/c_misc/missions.lib", encrypted);
 	Common::ArchiveMemberList files;
 	if (missions->listMembers(files) == 0)
@@ -153,20 +153,31 @@ void WetEngine::loadAssetsDemoDisc() {
 	_levels["<start>"] = start;
 
 	Transition *intro;
-	if (_variant == "Demo")
+	if (_variant == "Demo" || _variant == "M&MCD")
 		intro = new Transition("c31");
 	else if (_variant == "DemoHebrew")
 		intro = new Transition("c31.mis");
 	else
 		error("Unsupported language");
 
-	intro->intros.push_back("movie/nw_logo.smk");
-	intro->intros.push_back("movie/hypnotix.smk");
-	intro->intros.push_back("movie/wetlogo.smk");
-	intro->frameImage = "wetlands/c_misc/c.s";
-	intro->frameNumber = 0;
+	if (_variant == "M&MCD") {
+		intro->intros.push_back("wetlands/c_misc/nw_logo.smk");
+		intro->intros.push_back("wetlands/c_misc/h.s");
+		intro->intros.push_back("wetlands/c_misc/w.s");
+		intro->frameImage = "wetlands/c_misc/c.s";
+		intro->frameNumber = 0;
+	} else {
+		intro->intros.push_back("movie/nw_logo.smk");
+		intro->intros.push_back("movie/hypnotix.smk");
+		intro->intros.push_back("movie/wetlogo.smk");
+		intro->frameImage = "wetlands/c_misc/c.s";
+		intro->frameNumber = 0;
+	}
 	_levels["<intro>"] = intro;
 
+	if (_variant == "M&MCD") // This variant has no selector
+		_levels["<start>"] = intro;
+
 	Transition *movies = new Transition("<quit>");
 	movies->intros.push_back("movie/nw_logo.smk");
 	movies->intros.push_back("movie/hypnotix.smk");
@@ -189,7 +200,7 @@ void WetEngine::loadAssetsDemoDisc() {
 	_levels["<movies>"] = movies;
 	ArcadeShooting *arc;
 
-	if (_variant == "Demo") {
+	if (_variant == "Demo" || _variant == "M&MCD") {
 		loadArcadeLevel("c31.mi_", "c52", "c52", "wetlands");
 		if (_restoredContentEnabled) {
 			arc = (ArcadeShooting*) _levels["c31.mi_"];
@@ -556,7 +567,7 @@ void WetEngine::loadAssetsFullGame() {
 }
 
 void WetEngine::showCredits() {
-	if (!isDemo() || (_variant == "Demo" && _language == Common::EN_USA)) {
+	if (!isDemo() || ((_variant == "Demo" || _variant == "M&MCD") && _language == Common::EN_USA)) {
 		MVideo video("c_misc/credits.smk", Common::Point(0, 0), false, true, false);
 		runIntro(video);
 	}