[Scummvm-git-logs] scummvm master -> 416c7e153026d0822badeb27111ce7fb88cea5f7

neuromancer noreply at scummvm.org
Sun Jan 2 11:01:40 UTC 2022


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:
416c7e1530 HYPNO: added warning about c6


Commit: 416c7e153026d0822badeb27111ce7fb88cea5f7
    https://github.com/scummvm/scummvm/commit/416c7e153026d0822badeb27111ce7fb88cea5f7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-01-02T12:00:48+01:00

Commit Message:
HYPNO: added warning about c6

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 60370d79e22..872a35fc1ef 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -24,6 +24,7 @@
 
 #include "common/events.h"
 #include "graphics/cursorman.h"
+#include "gui/message.h"
 
 namespace Hypno {
 
@@ -143,6 +144,11 @@ void SpiderEngine::drawPlayer() {
 		_playerFrameIdx = oIndexYE[idx];
 		ox = _screenW / 2 - _playerFrames[0]->w / 2;
 		oy = _screenH - _playerFrames[0]->h;
+		if (_arcadeMode == "YF")  { // Remove me later
+			GUI::MessageDialog dialog("The following arcade sequence is not fully implemented yet, so it will be skipped");
+			dialog.runModal();
+			_skipLevel = true;
+		}
 	} else if (_arcadeMode == "YB") {
 		ox = 60;
 		oy = 129;
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index b8815f4e28e..0b90bf32728 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -550,9 +550,14 @@ void SpiderEngine::loadAssetsFullGame() {
 	_levels["c6.mi_"]->intros.push_back("cine/dia007s.smk");
 	_levels["c6.mi_"]->intros.push_back("cine/rdss001s.smk");
 
+	loadArcadeLevel("c6h.mi_", "<lock>", prefix);
+	_levels["c6h.mi_"]->intros.push_back("cine/vrfs002s.smk");
+	_levels["c6h.mi_"]->intros.push_back("cine/dia007s.smk");
+	_levels["c6h.mi_"]->intros.push_back("cine/rdss001s.smk");
+
 	Code *lock = new Code();
 	lock->name = "<lock>";
-	lock->intros.push_back("cine/rdss003s.smk");
+	lock->intros.push_back("spider/cine/rdss003s.smk");
 	lock->levelIfWin = "movie2.mi_";
 	_levels["<lock>"] = lock;
 
@@ -735,10 +740,6 @@ void SpiderEngine::loadAssetsFullGame() {
 	_levels["c12h.mi_"]->intros.push_back("cine/cybs001s.smk");
 	_levels["c12mh.mi_"] = _levels["c12h.mi_"];
 
-	loadArcadeLevel("c6h.mi_", "<lock>", prefix);
-	_levels["c6h.mi_"]->intros.push_back("cine/vrfs002s.smk");
-	_levels["c6h.mi_"]->intros.push_back("cine/dia007s.smk");
-
 	loadSceneLevel("decide11.mi_", "", prefix);
 
 	// Game overs




More information about the Scummvm-git-logs mailing list