[Scummvm-git-logs] scummvm master -> 8220e3b83ecf776057d8adb4f3668fca7e2f3aa4
neuromancer
noreply at scummvm.org
Wed Jan 5 09:12:47 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:
8220e3b83e HYPNO: added missing game overs in spider
Commit: 8220e3b83ecf776057d8adb4f3668fca7e2f3aa4
https://github.com/scummvm/scummvm/commit/8220e3b83ecf776057d8adb4f3668fca7e2f3aa4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-01-05T10:11:50+01:00
Commit Message:
HYPNO: added missing game overs in spider
Changed paths:
engines/hypno/arcade.cpp
engines/hypno/spider/spider.cpp
diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 9d7ff11d44d..ccce798a640 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -184,6 +184,8 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
showCredits();
changeScreenMode("320x200");
background.decoder->pauseVideo(false);
+ } else if (event.kbd.keycode == Common::KEYCODE_k) { // Added for testing
+ _health = 0;
} else if (event.kbd.keycode == Common::KEYCODE_LEFT) {
_lastPlayerPosition = _currentPlayerPosition;
_currentPlayerPosition = PlayerLeft;
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index 97aaee709d0..1430ee22270 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -499,15 +499,19 @@ void SpiderEngine::loadAssetsFullGame() {
_levels["<back_roof_2>"]->intros.push_back("spider/cine/recpout.smk");
loadArcadeLevel("c4.mi_", "c2", prefix);
+ _levels["c4.mi_"]->levelIfLose = "<over_hob_vul>";
_levels["c4.mi_"]->intros.push_back("cine/dals001s.smk");
loadArcadeLevel("c2.mi_", "<after_c2>", prefix);
+ _levels["c2.mi_"]->levelIfLose = "<over_hob_vul>";
_levels["c2.mi_"]->intros.push_back("cine/dals002s.smk");
loadArcadeLevel("c4h.mi_", "c2", prefix);
+ _levels["c4h.mi_"]->levelIfLose = "<over_hob_vul>";
_levels["c4h.mi_"]->intros.push_back("cine/dals001s.smk");
loadArcadeLevel("c2h.mi_", "<after_c2>", prefix);
+ _levels["c2h.mi_"]->levelIfLose = "<over_hob_vul>";
_levels["c2h.mi_"]->intros.push_back("cine/dals002s.smk");
Transition *after_c2 = new Transition("decide4.mi_");
@@ -523,10 +527,11 @@ void SpiderEngine::loadAssetsFullGame() {
sc->hots[4].actions.push_back(cl);
loadArcadeLevel("c5.mi_", "<trans_apt_6>", prefix);
+ _levels["c5.mi_"]->levelIfLose = "<over_hob2>";
_levels["c5.mi_"]->intros.push_back("cine/ctss001s.smk");
loadArcadeLevel("c5h.mi_", "<trans_apt_6>", prefix);
+ _levels["c5h.mi_"]->levelIfLose = "<over_hob2>";
_levels["c5h.mi_"]->intros.push_back("cine/ctss001s.smk");
-
Transition *trans_apt_6 = new Transition("factory1.mi_");
trans_apt_6->intros.push_back("spider/cine/apts06as.smk");
_levels["<trans_apt_6>"] = trans_apt_6;
@@ -548,17 +553,21 @@ void SpiderEngine::loadAssetsFullGame() {
loadSceneLevel("intercom.mi_", "c3", prefix);
loadArcadeLevel("c3.mi_", "c6", prefix);
+ _levels["c3.mi_"]->levelIfLose = "<over_octo1>";
_levels["c3.mi_"]->intros.push_back("cine/vrfs001s.smk");
loadArcadeLevel("c3h.mi_", "c6", prefix);
+ _levels["c3h.mi_"]->levelIfLose = "<over_octo1>";
_levels["c3h.mi_"]->intros.push_back("cine/vrfs001s.smk");
loadArcadeLevel("c6.mi_", "<lock>", "spider");
+ _levels["c6.mi_"]->levelIfLose = "<over_gas>";
_levels["c6.mi_"]->intros.push_back("cine/vrfs002s.smk");
_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_"]->levelIfLose = "<over_gas>";
_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");
@@ -613,9 +622,11 @@ void SpiderEngine::loadAssetsFullGame() {
sc->hots[4].actions.push_back(cl);
loadArcadeLevel("c13.mi_", "<after_c13>", prefix);
+ _levels["c13.mi_"]->levelIfLose = "<over_shock>";
_levels["c13.mi_"]->intros.push_back("cine/spf007bs.smk");
loadArcadeLevel("c13h.mi_", "<after_c13>", prefix);
+ _levels["c13h.mi_"]->levelIfLose = "<over_shock>";
_levels["c13h.mi_"]->intros.push_back("cine/spf007bs.smk");
Transition *after_c13 = new Transition("docoffi2.mi_");
@@ -647,8 +658,10 @@ void SpiderEngine::loadAssetsFullGame() {
sc->hots[4].actions.push_back(cl);
loadArcadeLevel("c8.mi_", "<after_c8>", prefix);
+ _levels["c8.mi_"]->levelIfLose = "<over_myst2>";
_levels["c8.mi_"]->intros.push_back("cine/utns001s.smk");
loadArcadeLevel("c8h.mi_", "<after_c8>", prefix);
+ _levels["c8h.mi_"]->levelIfLose = "<over_myst2>";
_levels["c8h.mi_"]->intros.push_back("cine/utns001s.smk");
Transition *after_c8 = new Transition("c10");
@@ -656,8 +669,10 @@ void SpiderEngine::loadAssetsFullGame() {
_levels["<after_c8>"] = after_c8;
loadArcadeLevel("c9.mi_", "<after_c9>", prefix);
+ _levels["c9.mi_"]->levelIfLose = "<over_vul2>";
_levels["c9.mi_"]->intros.push_back("cine/vrfs005s.smk");
loadArcadeLevel("c9h.mi_", "<after_c9>", prefix);
+ _levels["c9h.mi_"]->levelIfLose = "<over_vul2>";
_levels["c9h.mi_"]->intros.push_back("cine/vrfs005s.smk");
Transition *after_c9 = new Transition("c10");
@@ -665,8 +680,10 @@ void SpiderEngine::loadAssetsFullGame() {
_levels["<after_c9>"] = after_c9;
loadArcadeLevel("c10.mi_", "<after_c10>", prefix);
+ _levels["c10.mi_"]->levelIfLose = "<over_cam>";
_levels["c10.mi_"]->intros.push_back("cine/utns003s.smk");
loadArcadeLevel("c10h.mi_", "<after_c10>", prefix);
+ _levels["c10h.mi_"]->levelIfLose = "<over_cam>";
_levels["c10h.mi_"]->intros.push_back("cine/utns003s.smk");
Transition *after_c10 = new Transition("docoffic.mi_");
@@ -686,10 +703,10 @@ void SpiderEngine::loadAssetsFullGame() {
// Octopus fight without Mason
loadArcadeLevel("c11.mi_", "<chip_dies_with_shocker>", prefix);
- _levels["c11.mi_"]->levelIfLose = "????";
+ _levels["c11.mi_"]->levelIfLose = "<over_octo2>";
_levels["c11s.mi_"] = _levels["c11.mi_"];
loadArcadeLevel("c11h.mi_", "<chip_dies_with_shocker>", prefix);
- _levels["c11h.mi_"]->levelIfLose = "????";
+ _levels["c11h.mi_"]->levelIfLose = "<over_octo2>";
_levels["c11sh.mi_"] = _levels["c11h.mi_"];
loadArcadeLevel("c12.mi_", "<chip_lives_with_shocker>", prefix);
@@ -752,6 +769,7 @@ void SpiderEngine::loadAssetsFullGame() {
// Game overs
Transition *over_apt_1 = new Transition("tryagain.mi_");
+ over_apt_1->intros.push_back("spider/cine/ross003s.smk");
over_apt_1->intros.push_back("spider/cine/apts01as.smk");
_levels["<over_apt_1>"] = over_apt_1;
@@ -759,17 +777,53 @@ void SpiderEngine::loadAssetsFullGame() {
over_apt_5->intros.push_back("spider/cine/apts05as.smk");
_levels["<over_apt_5>"] = over_apt_5;
+ Transition *over_alley = new Transition("tryagain.mi_");
+ over_alley->intros.push_back("spider/cine/bals002s.smk");
+ _levels["<over_alley>"] = over_alley;
+
Transition *over_bus = new Transition("tryagain.mi_");
over_bus->intros.push_back("spider/cine/blcs002s.smk");
over_bus->intros.push_back("spider/cine/apt04as.smk");
_levels["<over_bus>"] = over_bus;
- Transition *over_octo = new Transition("tryagain.mi_");
- over_octo->intros.push_back("spider/cine/???.smk");
- _levels["<over_octo>"] = over_octo;
+ Transition *over_octo1 = new Transition("tryagain.mi_");
+ over_octo1->intros.push_back("spider/cine/doos001a.smk");
+ _levels["<over_octo>"] = over_octo1;
+
+ Transition *over_hob_vul = new Transition("tryagain.mi_");
+ over_hob_vul->intros.push_back("spider/cine/dals001a.smk");
+ _levels["<over_hob_vul>"] = over_hob_vul;
+
+ Transition *over_hob2 = new Transition("tryagain.mi_");
+ over_hob2->intros.push_back("spider/cine/ctss01as.smk");
+ _levels["<over_hob2>"] = over_hob2;
+
+ Transition *over_gas = new Transition("tryagain.mi_");
+ over_gas->intros.push_back("spider/cine/rdss002s.smk");
+ _levels["<over_gas>"] = over_gas;
+
+ Transition *over_myst2 = new Transition("tryagain.mi_");
+ over_myst2->intros.push_back("spider/cine/utns01as.smk");
+ _levels["<over_myst2>"] = over_myst2;
+
+ Transition *over_cam = new Transition("tryagain.mi_");
+ over_cam->intros.push_back("spider/cine/utns04as.smk");
+ _levels["<over_cam>"] = over_cam;
+
+ Transition *over_octo2 = new Transition("tryagain.mi_");
+ over_octo2->intros.push_back("spider/cine/vrfs01as.smk");
+ _levels["<over_octo2>"] = over_octo2;
+
+ Transition *over_vul2 = new Transition("tryagain.mi_");
+ over_vul2->intros.push_back("spider/cine/vrfs05as.smk");
+ _levels["<over_vul2>"] = over_vul2;
+
+ Transition *over_shock = new Transition("tryagain.mi_");
+ over_shock->intros.push_back("spider/cine/vrfs06as.smk");
+ _levels["<over_shock>"] = over_shock;
Transition *over_vr = new Transition("tryagain.mi_");
- over_vr->intros.push_back("spider/cine/cybs001s.smk");
+ over_vr->intros.push_back("spider/cine/cybs002s.smk");
_levels["<over_vr>"] = over_vr;
// Endings
More information about the Scummvm-git-logs
mailing list