[Scummvm-git-logs] scummvm master -> 4a6042e658ae996725ad11ef2f10bcb81e625673

[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:
8fbd5f04ad HYPNO: fixed practice combat menu in spider
4a6042e658 HYPNO: avoid rendering menu in main menu in spider


Commit: 8fbd5f04ad57bcc866a3e52aa7dc9681203e90bf
    https://github.com/scummvm/scummvm/commit/8fbd5f04ad57bcc866a3e52aa7dc9681203e90bf
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-03T09:23:25+01:00

Commit Message:
HYPNO: fixed practice combat menu in spider

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


diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index 4a1c113af9e..3377e2a0f81 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -158,28 +158,28 @@ void SpiderEngine::loadAssetsFullGame() {
 	_levels["c2h_solo.mi_"] = _levels["c2h.mi_"];
 
 	cl = new ChangeLevel("c2h_solo.mi_");
-	sc->hots[3].actions.push_back(cl);
+	sc->hots[4].actions.push_back(cl);
 
 	loadArcadeLevel("c3h.mi_", "<practice_win>", prefix);
 	_levels["c3h.mi_"]->levelIfLose = "<practice_lose>";
 	_levels["c3h_solo.mi_"] = _levels["c3h.mi_"];
 
 	cl = new ChangeLevel("c3h_solo.mi_");
-	sc->hots[4].actions.push_back(cl);
+	sc->hots[6].actions.push_back(cl);
 
 	loadArcadeLevel("c4h.mi_", "<practice_win>", prefix);
 	_levels["c4h.mi_"]->levelIfLose = "<practice_lose>";
 	_levels["c4h_solo.mi_"] = _levels["c4h.mi_"];
 
 	cl = new ChangeLevel("c4h_solo.mi_");
-	sc->hots[5].actions.push_back(cl);
+	sc->hots[3].actions.push_back(cl);
 
 	loadArcadeLevel("c5h.mi_", "<practice_win>", prefix);
 	_levels["c5h.mi_"]->levelIfLose = "<practice_lose>";
 	_levels["c5h_solo.mi_"] = _levels["c5h.mi_"];
 
 	cl = new ChangeLevel("c5h_solo.mi_");
-	sc->hots[6].actions.push_back(cl);
+	sc->hots[5].actions.push_back(cl);
 
 	loadArcadeLevel("c8h.mi_", "<practice_win>", prefix);
 	_levels["c8h.mi_"]->levelIfLose = "<practice_lose>";
@@ -214,6 +214,13 @@ void SpiderEngine::loadAssetsFullGame() {
 	_levels["c12h_solo.mi_"] = _levels["c12h.mi_"];
 
 	cl = new ChangeLevel("c12h_solo.mi_");
+	sc->hots[12].actions.push_back(cl);
+
+	loadArcadeLevel("c13h.mi_", "<practice_win>", prefix);
+	_levels["c13h.mi_"]->levelIfLose = "<practice_lose>";
+	_levels["c13h_solo.mi_"] = _levels["c13h.mi_"];
+
+	cl = new ChangeLevel("c13h_solo.mi_");
 	sc->hots[11].actions.push_back(cl);
 
 	loadSceneLevel("mv0t.mi_", "roof.mi_", prefix);


Commit: 4a6042e658ae996725ad11ef2f10bcb81e625673
    https://github.com/scummvm/scummvm/commit/4a6042e658ae996725ad11ef2f10bcb81e625673
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-03T09:23:25+01:00

Commit Message:
HYPNO: avoid rendering menu in main menu in spider

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


diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index 3377e2a0f81..60fd533d91e 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -1100,7 +1100,8 @@ void SpiderEngine::drawBackToMenu(Hotspot *h) {
 					transparent = true;
 				}
 			} else {
-				menu = decodeFrame("int_main/menu.smk", 0);
+				if (_currentLevel != "mainmenu.mi_" && _currentLevel != "options.mi_" && _currentLevel != "combmenu.mi_")
+					menu = decodeFrame("int_main/menu.smk", 0);
 			}
 		}