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

[neuromancer]

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:
ccd0978db0 HYPNO: enabled restored content in gen4 wet demo
3606d74bde HYPNO: enabled restored content in pcw wet demo
e938eb0ee8 HYPNO: enabled restored content in pcg wet demo


Commit: ccd0978db0ec780ce1535f9edcd187c136ac421a
    https://github.com/scummvm/scummvm/commit/ccd0978db0ec780ce1535f9edcd187c136ac421a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-05T12:51:34+02:00

Commit Message:
HYPNO: enabled restored content in gen4 wet demo

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


diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 97872c546a4..43862b7408f 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -227,7 +227,19 @@ void WetEngine::loadAssetsGen4() {
 	_levels["<start>"] = intro;
 
 	loadArcadeLevel("c31.mis", "c52.mis", "c52.mis", "");
+	ArcadeShooting *arc;
+	if (_restoredContentEnabled) {
+		arc = (ArcadeShooting*) _levels["c31.mis"];
+		arc->segments[0].size = 1354;
+		arc->objKillsRequired[0] = 2;
+	}
 	loadArcadeLevel("c52.mis", "<game_over>", "<quit>", "");
+	if (_restoredContentEnabled) {
+		arc = (ArcadeShooting*) _levels["c52.mis"];
+		arc->segments[0].size = 2383;
+		arc->objKillsRequired[0] = 2;
+		arc->objKillsRequired[1] = 13;
+	}
 
 	Transition *over = new Transition("<quit>");
 	over->intros.push_back("c_misc/g.s");


Commit: 3606d74bdea6f57144593c3ea5926f76a8658d77
    https://github.com/scummvm/scummvm/commit/3606d74bdea6f57144593c3ea5926f76a8658d77
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-05T12:51:34+02:00

Commit Message:
HYPNO: enabled restored content in pcw wet demo

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


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 5fd110723d5..ea201b3c910 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -352,8 +352,15 @@ bool WetEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting *
 				return true;
 			}
 		}
-
-		if (!at.video.empty()) {
+		if (at.video.empty() && !at.palette.empty()) {
+			_background->decoder->pauseVideo(true);
+			_currentPalette = at.palette;
+			loadPalette(_currentPalette);
+			_background->decoder->pauseVideo(false);
+			drawPlayer();
+			updateScreen(*_background);
+			drawScreen();
+		} else if (!at.video.empty()) {
 			_background->decoder->pauseVideo(true);
 			debugC(1, kHypnoDebugArcade, "Playing transition %s", at.video.c_str());
 			MVideo video(at.video, Common::Point(0, 0), false, true, false);
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 43862b7408f..790cc300bda 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -312,6 +312,16 @@ void WetEngine::loadAssetsPCW() {
 	_levels["<start>"] = intro;
 
 	loadArcadeLevel("c11.mis", "<quit>", "<quit>", "");
+	ArcadeShooting *arc;
+	if (_restoredContentEnabled) {
+		arc = (ArcadeShooting*) _levels["c11.mis"];
+		arc->segments[0].size = 2002;
+		arc->objKillsRequired[0] = 1;
+		arc->transitions.push_back(ArcadeTransition("", "c11/c11p2.col", "", 0, 1501));
+		// These videos were not included in the demo, so we replace them
+		arc->defeatMissBossVideo = "c11\\c11d1.smk";
+		arc->defeatNoEnergySecondVideo = "c11\\c11d1.smk";
+	}
 
 	Transition *over = new Transition("<quit>");
 	_levels["<game_over>"] = over;


Commit: e938eb0ee87d737b60baef03a2cd24d2e4720917
    https://github.com/scummvm/scummvm/commit/e938eb0ee87d737b60baef03a2cd24d2e4720917
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-05T12:51:34+02:00

Commit Message:
HYPNO: enabled restored content in pcg wet demo

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


diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 790cc300bda..8a82cd8eba1 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -348,6 +348,18 @@ void WetEngine::loadAssetsPCG() {
 	_levels["<start>"] = intro;
 
 	loadArcadeLevel("c31.mis", "<quit>", "<quit>", "");
+	ArcadeShooting *arc;
+	if (_restoredContentEnabled) {
+		arc = (ArcadeShooting*) _levels["c31.mis"];
+		arc->segments[0].size = 1354;
+		arc->objKillsRequired[0] = 2;
+		// These videos were not included in the demo, so we replace or remove them
+		arc->hitBoss1Video = "";
+		arc->hitBoss2Video = "";
+		arc->missBoss1Video = "";
+		arc->missBoss2Video = "";
+		arc->defeatMissBossVideo = "c31\\c31d1s.smk";
+	}
 
 	Transition *over = new Transition("<quit>");
 	over->intros.push_back("g.s");