[Scummvm-git-logs] scummvm master -> decc52340ea8ef9357789532e260d3af969864f0

[neuromancer]

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:
decc52340e HYPNO: correctly loading spider demo (again)


Commit: decc52340ea8ef9357789532e260d3af969864f0
    https://github.com/scummvm/scummvm/commit/decc52340ea8ef9357789532e260d3af969864f0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-01-16T10:41:52+01:00

Commit Message:
HYPNO: correctly loading spider demo (again)

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


diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index da8afdcc1bd..0d033df4034 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -58,7 +58,7 @@ void SpiderEngine::loadAssetsFullGame() {
 	//loadLib("", "c_misc/fonts.lib", true);
 	loadLib("spider/sound.lib/", "spider/c_misc/sound.lib", true);
 
-	_levels["<quit>"]->prefix = "spider";
+	_levels["<quit>"]->prefix = prefix;
 
 	Code *credits = new Code();
 	credits->name = "<credits>";
@@ -943,19 +943,22 @@ void SpiderEngine::loadAssetsDemo() {
 		error("Failed to open DATA.Z");
 
 	SearchMan.add("DATA.Z", (Common::Archive *) &_installerArchive, 0, false);
+	Common::String prefix = "sixdemo";
 
 	Common::ArchiveMemberList files;
-	LibFile *missions = loadLib("", "c_misc/missions.lib", true);
+	LibFile *missions = loadLib("", "sixdemo/c_misc/missions.lib", true);
 	if (missions == nullptr || missions->listMembers(files) == 0)
 		error("Failed to load any file from missions.lib");
 
+	_levels["<quit>"]->prefix = prefix;
 	// start level
 	Transition *start = new Transition("sixdemo/mis/demo.mis");
+	start->prefix = prefix;
 	start->intros.push_back("demo/dcine1.smk");
 	start->intros.push_back("demo/dcine2.smk");
 	_levels["<start>"] = start;
 
-	loadArcadeLevel("c1.mi_", "mis/demo.mis", "");
+	loadArcadeLevel("c1.mi_", "mis/demo.mis", prefix);
 	_levels["c1.mi_"]->levelIfLose = "sixdemo/mis/demo.mis";
 
 	loadLib("", "c_misc/fonts.lib", true);
@@ -963,7 +966,7 @@ void SpiderEngine::loadAssetsDemo() {
 	loadLib("demo/sound.lib/", "demo/sound.lib", true);
 
 	// Read assets from mis files
-	loadSceneLevel("sixdemo/mis/demo.mis", "", "");
+	loadSceneLevel("sixdemo/mis/demo.mis", "", prefix);
 	ChangeLevel *cl = new ChangeLevel("c1.mi_");
 
 	Scene *sc = (Scene *) _levels["sixdemo/mis/demo.mis"];
@@ -982,12 +985,12 @@ void SpiderEngine::loadAssetsDemo() {
 	sc->hots[5].actions.push_back(cl);
 	sc->music = "demo/sound.lib/menu_mus.raw";
 
-	loadSceneLevel("sixdemo/mis/order.mis", "", "");
+	loadSceneLevel("sixdemo/mis/order.mis", "", prefix);
 	sc = (Scene *) _levels["sixdemo/mis/order.mis"];
 	cl = new ChangeLevel("<quit>");
 	sc->hots[1].actions.push_back(cl);
 
-	loadSceneLevel("sixdemo/mis/alley.mis", "", "");
+	loadSceneLevel("sixdemo/mis/alley.mis", "", prefix);
 	sc = (Scene *) _levels["sixdemo/mis/alley.mis"];
 
 	sc->intros.push_back("demo/aleyc01s.smk");
@@ -995,9 +998,10 @@ void SpiderEngine::loadAssetsDemo() {
 	sc->levelIfWin = "sixdemo/mis/demo.mis";
 	sc->levelIfLose = "sixdemo/mis/demo.mis";
 
-	loadSceneLevel("sixdemo/mis/shoctalk.mis", "", "");
+	loadSceneLevel("sixdemo/mis/shoctalk.mis", "", prefix);
 
 	Code *matrix = new Code();
+	matrix->prefix = prefix;
 	matrix->name = "<puz_matr>";
 	matrix->intros.push_back("demo/aleyc01s.smk");
 	matrix->levelIfWin = "sixdemo/mis/demo.mis";