[Scummvm-git-logs] scummvm master -> 4ac4dd5583184a5e21b173f86db89541107af0cb

[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:
4ed0e0e462 HYPNO: added remaining c30 levels and a specific segment branch in wet
4ac4dd5583 HYPNO: removed annoying flash during certain arcade sequences


Commit: 4ed0e0e46251b9ed4a5ba8be91f97fd111b58121
    https://github.com/scummvm/scummvm/commit/4ed0e0e46251b9ed4a5ba8be91f97fd111b58121
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-24T20:40:13+01:00

Commit Message:
HYPNO: added remaining c30 levels and a specific segment branch in wet

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 253a4623926..c3eddc4d779 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -112,6 +112,11 @@ void WetEngine::findNextSegment(ArcadeShooting *arc) {
 				_segmentIdx = _segmentIdx + 1;
 			else 
 				_segmentIdx = _segmentIdx + 2;
+		} else if (segments[_segmentIdx].type == 0xcc) {
+			if (mousePos.x <= 160)
+				_segmentIdx = _segmentIdx + 1;
+			else 
+				_segmentIdx = _segmentIdx + 2;
 		} else {
 
 			// Objective checking
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index ce55d421bb5..1d4a1bf3e38 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -297,7 +297,12 @@ void WetEngine::loadAssetsFullGame() {
 	arc->id = 30; // Fixed from the original (3)
 
 	loadArcadeLevel("c301.mi_", "c41", "<check_lives>", "");
+	arc = (ArcadeShooting*) _levels["c301.mi_"];
+	arc->id = 30; // Fixed from the original (3)
+
 	loadArcadeLevel("c302.mi_", "c41", "<check_lives>", "");
+	arc = (ArcadeShooting*) _levels["c302.mi_"];
+	arc->id = 30; // Fixed from the original (3)
 
 	loadArcadeLevel("c410.mi_", "c42", "<check_lives>", "");
 	loadArcadeLevel("c411.mi_", "c42", "<check_lives>", "");


Commit: 4ac4dd5583184a5e21b173f86db89541107af0cb
    https://github.com/scummvm/scummvm/commit/4ac4dd5583184a5e21b173f86db89541107af0cb
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-24T21:15:51+01:00

Commit Message:
HYPNO: removed annoying flash during certain arcade sequences

Changed paths:
    engines/hypno/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 6e72049aa69..750a89de11f 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -213,7 +213,6 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 
 	Common::Event event;
 	while (!shouldQuit()) {
-		//debug("frame: %d", background.decoder->getCurFrame());
 		needsUpdate = background.decoder->needsUpdate();
 		while (g_system->getEventManager()->pollEvent(event)) {
 			mousePos = g_system->getEventManager()->getMousePos();
@@ -308,7 +307,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 			drawScreen();
 		}
 
-		if (background.decoder && background.decoder->getCurFrame() >= int(segments[_segmentIdx].start + segments[_segmentIdx].size - 1)) {
+		if (background.decoder && background.decoder->getCurFrame() >= int(segments[_segmentIdx].start + segments[_segmentIdx].size - 2)) {
 			debugC(1, kHypnoDebugArcade, "Finished segment %d of type %x", _segmentIdx, segments[_segmentIdx].type);
 
 			// Clear shoots
@@ -325,8 +324,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 
 			debugC(1, kHypnoDebugArcade, "Starting segment %d of type %x at %d", _segmentIdx, segments[_segmentIdx].type, segments[_segmentIdx].start);
 			if (!segments[_segmentIdx].end) { // If it is not the end segment
-				background.decoder->forceSeekToFrame(segments[_segmentIdx].start+2);
-				needsUpdate = true;
+				background.decoder->forceSeekToFrame(segments[_segmentIdx].start);
 				continue;
 			} else 
 				_skipLevel = true;