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

[neuromancer]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d71716ff2a HYPNO: implement scummvm cheat to unlock all levels in wet
7dfc378552 HYPNO: reset _currentActor before each level in boyz
471c189560 HYPNO: avoid palette issue in the last level of boyz
2ec5a1d84b HYPNO: fixed corrupted crossair in boyz


Commit: d71716ff2a82344e502b3043b0c05d6ce08905d6
    https://github.com/scummvm/scummvm/commit/d71716ff2a82344e502b3043b0c05d6ce08905d6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-20T17:03:55+02:00

Commit Message:
HYPNO: implement scummvm cheat to unlock all levels in wet

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


diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index cbd62c766f6..7b95a8ebe86 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -182,7 +182,7 @@ void WetEngine::runMainMenu(Code *code) {
 		g_system->delayMillis(10);
 	}
 
-	if (_name == "COOLCOLE") {
+	if (_name == "COOLCOLE" || _unlockAllLevels) {
 		_lastLevel = 19;
 		playSound("sound/extra.raw", 1);
 	} else


Commit: 7dfc3785528f84dfed9880f94a39d26b229b6fb8
    https://github.com/scummvm/scummvm/commit/7dfc3785528f84dfed9880f94a39d26b229b6fb8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-20T17:03:55+02:00

Commit Message:
HYPNO: reset _currentActor before each level in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index dc395a625d6..363e65f5e53 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -72,7 +72,7 @@ void BoyzEngine::runBeforeArcade(ArcadeShooting *arc) {
 	for (Script::iterator it = _currentScript.begin(); it != _currentScript.end(); ++it) {
 		_ammo = _weaponMaxAmmo[it->cursor];
 	}
-
+	_currentActor = 0;
 	updateFromScript();
 	_shootsDestroyed.clear();
 	_health = _previousHealth;


Commit: 471c189560a91563dbc55637bf3b41f0cbe4d392
    https://github.com/scummvm/scummvm/commit/471c189560a91563dbc55637bf3b41f0cbe4d392
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-20T17:03:55+02:00

Commit Message:
HYPNO: avoid palette issue in the last level of boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 363e65f5e53..ec5604265f1 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -371,6 +371,8 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 			}
 		} else if (!at.video.empty()) {
 			_background->decoder->pauseVideo(true);
+			_masks->decoder->pauseVideo(true);
+
 			debugC(1, kHypnoDebugArcade, "Playing transition %s", at.video.c_str());
 			MVideo video(at.video, Common::Point(0, 0), false, true, false);
 			disableCursor();
@@ -380,7 +382,13 @@ bool BoyzEngine::checkTransition(ArcadeTransitions &transitions, ArcadeShooting
 				_currentPalette = at.palette;
 
 			loadPalette(_currentPalette);
+			if (_levelId == 59) {
+				_background->decoder->forceSeekToFrame(97);
+				_masks->decoder->forceSeekToFrame(97);
+			}
+
 			_background->decoder->pauseVideo(false);
+			_masks->decoder->pauseVideo(false);
 			if (!_music.empty())
 				playSound(_music, 0, _musicRate, _musicStereo); // restore music
 			drawPlayer();


Commit: 2ec5a1d84bcfc499368ff684e7aa07166cd93999
    https://github.com/scummvm/scummvm/commit/2ec5a1d84bcfc499368ff684e7aa07166cd93999
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-20T17:03:55+02:00

Commit Message:
HYPNO: fixed corrupted crossair in boyz

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


diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index 63e5dc8d717..8c0297cc7b5 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -840,7 +840,7 @@ void BoyzEngine::loadAssets() {
 	_crosshairsActive[5].create(cursorBox.width(), cursorBox.height(), _pixelFormat);
 	_crosshairsActive[5].copyRectToSurface(*targets, 0, 0, cursorBox);
 
-	cursorBox = Common::Rect(104, 71, 136, 83);
+	cursorBox = Common::Rect(104, 71, 136, 88);
 	_crosshairsTarget[5].create(cursorBox.width(), cursorBox.height(), _pixelFormat);
 	_crosshairsTarget[5].copyRectToSurface(*targets, 0, 0, cursorBox);