[Scummvm-git-logs] scummvm master -> 6bcd7320cbc4391549121a88bd117381fba1579e

[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:
9c4a8b0a46 HYPNO: do not show score when viewing the credits from menu in spider
6b1d13ef27 HYPNO: make sure menu is correctly drawn during the cabinet puzzle in spider
6bcd7320cb HYPNO: swap pointer after solve file cabinet puzzle in spider


Commit: 9c4a8b0a4614e94157856eb2acaee352c84e9b20
    https://github.com/scummvm/scummvm/commit/9c4a8b0a4614e94157856eb2acaee352c84e9b20
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-01T15:40:18+02:00

Commit Message:
HYPNO: do not show score when viewing the credits from menu in spider

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


diff --git a/engines/hypno/spider/hard.cpp b/engines/hypno/spider/hard.cpp
index a28dc5e603b..513af4d059c 100644
--- a/engines/hypno/spider/hard.cpp
+++ b/engines/hypno/spider/hard.cpp
@@ -1108,7 +1108,7 @@ void SpiderEngine::showCredits() {
 	changeScreenMode("640x480");
 	MVideo video("cine/credits.smk", Common::Point(0, 0), false, true, false);
 	runIntro(video);
-	if (_restoredContentEnabled) {
+	if (_restoredContentEnabled && !_checkpoint.empty()) {
 		showScore("Spider-Man saved the day!");
 	}
 	_score = 0;


Commit: 6b1d13ef27765b013508931ca3c0e2d0da35ba5e
    https://github.com/scummvm/scummvm/commit/6b1d13ef27765b013508931ca3c0e2d0da35ba5e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-01T15:40:18+02:00

Commit Message:
HYPNO: make sure menu is correctly drawn during the cabinet puzzle in spider

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


diff --git a/engines/hypno/spider/hard.cpp b/engines/hypno/spider/hard.cpp
index 513af4d059c..ca1d2f22501 100644
--- a/engines/hypno/spider/hard.cpp
+++ b/engines/hypno/spider/hard.cpp
@@ -763,6 +763,7 @@ void SpiderEngine::runFileCabinet(Code *code) {
 				for (int i = 0; i < 6; i++) {
 					drawImage(*nums[comb[i]], sel[i].left, sel[i].top, true);
 				}
+				drawImage(*menu, 0, 0, false);
 				break;
 
 


Commit: 6bcd7320cbc4391549121a88bd117381fba1579e
    https://github.com/scummvm/scummvm/commit/6bcd7320cbc4391549121a88bd117381fba1579e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-01T15:40:18+02:00

Commit Message:
HYPNO: swap pointer after solve file cabinet puzzle in spider

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


diff --git a/engines/hypno/spider/hard.cpp b/engines/hypno/spider/hard.cpp
index ca1d2f22501..8ec36680c23 100644
--- a/engines/hypno/spider/hard.cpp
+++ b/engines/hypno/spider/hard.cpp
@@ -735,6 +735,8 @@ void SpiderEngine::runFileCabinet(Code *code) {
 					}
 
 					_nextLevel = code->levelIfWin;
+					_defaultCursorIdx = 36;
+					defaultCursor();
 					return;
 				}