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

[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:
2a0b157d5d HYPNO: fixed parsing for some wetlands demos


Commit: 2a0b157d5de188575add1b5adde70fd119a8d743
    https://github.com/scummvm/scummvm/commit/2a0b157d5de188575add1b5adde70fd119a8d743
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-05T16:45:38+01:00

Commit Message:
HYPNO: fixed parsing for some wetlands demos

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


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 7804daaaf43..1e99d9cce4d 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -89,6 +89,8 @@ SegmentShootsSequence HypnoEngine::parseShootList(const Common::String &filename
 	ShootInfo si;
 	SegmentShootsSequence seq;
 	// Parsing
+	pdata.trim();
+	pdata = "\n" + pdata;
 
 	if (pdata[1] == 'L') { // List of elements
 		SegmentShoots ss;
@@ -120,7 +122,7 @@ SegmentShootsSequence HypnoEngine::parseShootList(const Common::String &filename
 		}
 	} else if (pdata[1] == 'S' ) { // Single element
 		SegmentShoots ss;
-		Common::StringTokenizer tok(pdata, " ,.\t");
+		Common::StringTokenizer tok(pdata, " ,.\t\r");
 		while (!tok.empty()) {
 			t = tok.nextToken();
 			if (t[0] == '\n')
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 5374294d978..a16fc1008f7 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -129,7 +129,14 @@ void WetEngine::loadAssetsDemoDisc() {
 	start->hots = hs;
 	_levels["<start>"] = start;
 
-	Transition *intro = new Transition("c31");
+	Transition *intro;
+	if (_language == Common::EN_USA)
+		intro = new Transition("c31");
+	else if (_language == Common::HE_ISR)
+		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");
@@ -378,7 +385,7 @@ void WetEngine::showCredits() {
 		return;
 	}
 
-	if (!isDemo() || _variant == "Demo") {
+	if (!isDemo() || _variant == "Demo" || _language == Common::EN_USA) {
 		MVideo video("c_misc/credits.smk", Common::Point(0, 0), false, true, false);
 		runIntro(video);
 	}