[Scummvm-git-logs] scummvm master -> 9d5cd371ae9b17b014500fc904141ce0162f13fd

[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:
7d9f5a2a88 HYPNO: fixed credits when played inside an arcade level
9d5cd371ae HYPNO: improved c3 arcade sequence in spider and fixed some other scenes


Commit: 7d9f5a2a88b0598cf9990ae3b9fcb9690b2b4ee9
    https://github.com/scummvm/scummvm/commit/7d9f5a2a88b0598cf9990ae3b9fcb9690b2b4ee9
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-12-04T10:11:29+01:00

Commit Message:
HYPNO: fixed credits when played inside an arcade level

Changed paths:
    engines/hypno/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index ae6e1eebbb..881d5c6d3b 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -181,6 +181,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 				if (event.kbd.keycode == Common::KEYCODE_c) {
 					background.decoder->pauseVideo(true);
 					showCredits();
+					changeScreenMode("320x200");
 					background.decoder->pauseVideo(false);
 				} else if (event.kbd.keycode == Common::KEYCODE_LEFT) {
 					_lastPlayerPosition = _currentPlayerPosition; 


Commit: 9d5cd371ae9b17b014500fc904141ce0162f13fd
    https://github.com/scummvm/scummvm/commit/9d5cd371ae9b17b014500fc904141ce0162f13fd
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-12-04T10:11:29+01:00

Commit Message:
HYPNO: improved c3 arcade sequence in spider and fixed some other scenes

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


diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index 20ed1d5cac..7e1206189a 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -38,7 +38,7 @@ void SpiderEngine::drawShoot(const Common::Point &target) {
 	uint32 ox = 0;
 	uint32 oy = 0;
 
-	if (_arcadeMode == "YC") {
+	if (_arcadeMode == "YC" || _arcadeMode == "YD") {
 		return; // Nothing to shoot
 	} else if (_arcadeMode == "YE") { 
 		ox = _screenW/2;
@@ -163,7 +163,7 @@ void SpiderEngine::drawPlayer() {
 }
 
 void SpiderEngine::drawCursorArcade(const Common::Point &mousePos) {
-	if (_arcadeMode != "YC") {
+	if (_arcadeMode != "YC" && _arcadeMode != "YD") {
 		HypnoEngine::drawCursorArcade(mousePos);
 	}
 }
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index 680feb48ff..2854a9e687 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -58,9 +58,10 @@ void SpiderEngine::loadAssetsFullGame() {
 	loadLib("spider/sound.lib/", "spider/c_misc/sound.lib", true);
 
 	Code *credits = new Code();
-	credits->name = "credits";
+	credits->name = "<credits>";
 	credits->prefix = prefix;
-	_levels["credits"] = credits;
+	_levels["<credits>"] = credits;
+	credits->levelIfWin = "options.mi_";
 
 	Scene *sc;
 	ChangeLevel *cl;
@@ -211,7 +212,12 @@ void SpiderEngine::loadAssetsFullGame() {
 	_levels["<note>"] = note;
 
 	loadSceneLevel("factory1.mi_", "intercom.mi_", prefix);
-	loadSceneLevel("intercom.mi_", "", prefix);
+	loadSceneLevel("intercom.mi_", "c3", prefix);
+
+	loadArcadeLevel("c3.mi_", "", prefix);
+	loadArcadeLevel("c3h.mi_", "", prefix);
+
+	loadSceneLevel("movie2.mi_", "", prefix);
 	//_levels["buspuz.mi_"]->intros.push_back("cine/ppv001s.smk");
 
 	// Transition *bus_transition = new Transition("buspuz.mi_");
@@ -224,7 +230,7 @@ void SpiderEngine::loadAssetsFullGame() {
 	// _levels["<bank_hard>"] = bankHard;
 
 	// Easy arcade levels
-	loadArcadeLevel("c3.mi_", "", prefix);
+
 	//loadArcadeLevel("c6.mi_", "", "spider");
 	// No c7 level?
 	loadArcadeLevel("c8.mi_", "", prefix);
@@ -235,7 +241,6 @@ void SpiderEngine::loadAssetsFullGame() {
 	loadArcadeLevel("c13.mi_", "", prefix);
 
 	// // Hard arcade levels
-	loadArcadeLevel("c3h.mi_", "", prefix);
 
 	//loadArcadeLevel("c6h.mi_", "", "spider");
 	// No c7h level?
@@ -686,9 +691,9 @@ void SpiderEngine::runNote(Code *code) {
 }
 
 void SpiderEngine::showCredits() {
+	changeScreenMode("640x480");
 	MVideo video("cine/credits.smk", Common::Point(0, 0), false, false, false);
 	runIntro(video);
-	_nextLevel = "mainmenu.mi_";
 }
 
 Common::String SpiderEngine::findNextLevel(const Transition *trans) {