[Scummvm-git-logs] scummvm master -> 43556391886e1d406f848698bcc505d7063d98e7

[neuromancer]

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:
4355639188 HYPNO: implemented non-internative wet demo


Commit: 43556391886e1d406f848698bcc505d7063d98e7
    https://github.com/scummvm/scummvm/commit/43556391886e1d406f848698bcc505d7063d98e7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T16:28:59+02:00

Commit Message:
HYPNO: implemented non-internative wet demo

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


diff --git a/engines/hypno/detection.cpp b/engines/hypno/detection.cpp
index 4e8c04d3ea8..5d7e50c3d4d 100644
--- a/engines/hypno/detection.cpp
+++ b/engines/hypno/detection.cpp
@@ -131,6 +131,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_TESTING | ADGF_DEMO,
 		GUIO1(GUIO_NOMIDI)
 	},
+	{
+		"wetlands", // Non Interactive demo featured in several game magazines
+		"NonInteractive",
+		AD_ENTRY2s("playsmks.exe", "edc5b0c0caf3d5b01d344cb555d9a085", 422607,
+				"wetmusic.81m", "0d99c63ce19633d09569b1fdcdff1505", 2833439),
+		Common::EN_USA,
+		Common::kPlatformDOS,
+		ADGF_TESTING | ADGF_DEMO,
+		GUIO1(GUIO_NOMIDI)
+	},
 	{
 		"wetlands", // Wetlands (US)
 		nullptr,
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 9ea0afd0a7e..06fd9867b12 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -369,6 +369,8 @@ public:
 	void loadAssetsPCW();
 	void loadAssetsPCG();
 	void loadAssetsFullGame();
+	void loadAssetsNI();
+
 	void loadFonts() override;
 	void drawString(const Filename &name, const Common::String &str, int x, int y, int w, uint32 c) override;
 
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 186e8a39739..514063090d7 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -86,6 +86,8 @@ void WetEngine::loadAssets() {
 		loadAssetsPCW();
 	else if (_variant == "PCGDemo")
 		loadAssetsPCG();
+	else if (_variant == "NonInteractive")
+		loadAssetsNI();
 	else
 		error("Invalid demo version: \"%s\"", _variant.c_str());
 }
@@ -190,6 +192,48 @@ void WetEngine::loadAssetsDemoDisc() {
 	_nextLevel = "<start>";
 }
 
+void WetEngine::loadAssetsNI() {
+	playSound("wetmusic.81m", 0, 11025);
+	Transition *movies = new Transition("<quit>");
+	movies->intros.push_back("demo/nw_logo.smk");
+	movies->intros.push_back("demo/hypnotix.smk");
+	movies->intros.push_back("demo/wetlogo.smk");
+	movies->intros.push_back("demo/c31c1.smk");
+	movies->intros.push_back("demo/demo31.smk");
+	movies->intros.push_back("demo/c31c2.smk");
+	movies->intros.push_back("demo/c31e1.smk");
+	movies->intros.push_back("demo/logo_w.smk");
+	movies->intros.push_back("demo/bar01b.smk");
+	movies->intros.push_back("demo/gun_320.smk");
+	movies->intros.push_back("demo/logo_e.smk");
+	movies->intros.push_back("demo/c30peek.smk");
+	movies->intros.push_back("demo/demo30.smk");
+	movies->intros.push_back("demo/c30knife.smk");
+	movies->intros.push_back("demo/logo_t.smk");
+	movies->intros.push_back("demo/c51teez.smk");
+	movies->intros.push_back("demo/demo21.smk");
+	movies->intros.push_back("demo/c51kill.smk");
+	movies->intros.push_back("demo/logo_l.smk");
+	movies->intros.push_back("demo/run_320.smk");
+	movies->intros.push_back("demo/logo_a.smk");
+	movies->intros.push_back("demo/demo50.smk");
+	movies->intros.push_back("demo/c50gate.smk");
+	movies->intros.push_back("demo/logo_n.smk");
+	movies->intros.push_back("demo/c22end.smk");
+	movies->intros.push_back("demo/logo_d.smk");
+	movies->intros.push_back("demo/demo44.smk");
+	movies->intros.push_back("demo/c44boom.smk");
+	movies->intros.push_back("demo/logo_s.smk");
+	movies->intros.push_back("demo/xi.smk");
+	movies->intros.push_back("demo/wetlogo.smk");
+	movies->intros.push_back("demo/c30shoot.smk");
+	movies->frameImage = "";
+	movies->frameNumber = 0;
+	_levels["<start>"] = movies;
+	_nextLevel = "<start>";
+}
+
+
 void WetEngine::loadAssetsPCW() {
 
 	LibFile *missions = loadLib("", "c_misc/missions.lib", false);