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

[sev-]

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:
1395a8b4e5 DIRECTOR: Process '@' in file path conversion
f48d052021 NGI: Loading of initial file for MDream


Commit: 1395a8b4e5ee37362d3603a12b1b42d06a219c41
    https://github.com/scummvm/scummvm/commit/1395a8b4e5ee37362d3603a12b1b42d06a219c41
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T21:56:30+02:00

Commit Message:
DIRECTOR: Process '@' in file path conversion

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 70055c14b6..e76f6028ff 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -246,7 +246,7 @@ Common::String convertPath(Common::String &path) {
 	if (path.empty())
 		return path;
 
-	if (!path.contains(':') && !path.contains('/') && !path.contains('\\')) {
+	if (!path.contains(':') && !path.contains('/') && !path.contains('\\') && !path.contains('@')) {
 		return path;
 	}
 
@@ -256,6 +256,9 @@ Common::String convertPath(Common::String &path) {
 	if (path.hasPrefix("::")) {
 		res = "..\\";
 		idx = 2;
+	} else if (path.hasPrefix("@:")) {
+		res = ".\\";
+		idx = 2;
 	} else {
 		res = ".\\";
 


Commit: f48d052021c57361a24eff0ed1077bf48fe30d0d
    https://github.com/scummvm/scummvm/commit/f48d052021c57361a24eff0ed1077bf48fe30d0d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-04T21:56:30+02:00

Commit Message:
NGI: Loading of initial file for MDream

Changed paths:
    engines/ngi/metaengine.cpp
    engines/ngi/ngi.cpp
    engines/ngi/ngi.h


diff --git a/engines/ngi/metaengine.cpp b/engines/ngi/metaengine.cpp
index e39d088611..129a77f915 100644
--- a/engines/ngi/metaengine.cpp
+++ b/engines/ngi/metaengine.cpp
@@ -49,6 +49,10 @@ const char *NGIEngine::getGameId() const {
 	return _gameDescription->desc.gameId;
 }
 
+int NGIEngine::getGameGID() const {
+	return _gameDescription->gameId;
+}
+
 } // End of namspace Fullpipe
 
 class NGIMetaEngine : public AdvancedMetaEngine {
diff --git a/engines/ngi/ngi.cpp b/engines/ngi/ngi.cpp
index 4356563fcc..5b95cfa1ff 100644
--- a/engines/ngi/ngi.cpp
+++ b/engines/ngi/ngi.cpp
@@ -31,6 +31,7 @@
 #include "graphics/surface.h"
 
 #include "ngi/ngi.h"
+#include "ngi/detection.h"
 #include "ngi/gameloader.h"
 #include "ngi/messages.h"
 #include "ngi/behavior.h"
@@ -282,8 +283,19 @@ Common::Error NGIEngine::run() {
 	if (ConfMan.hasKey("save_slot"))
 		scene = -1;
 
-	if (!loadGam("fullpipe.gam", scene))
-		return Common::kNoGameDataFoundError;
+	switch (getGameGID()) {
+	case GID_FULLPIPE:
+		if (!loadGam("fullpipe.gam", scene))
+			return Common::kNoGameDataFoundError;
+		break;
+	case GID_MDREAM:
+		if (!loadGam("new.gam", scene))
+			return Common::kNoGameDataFoundError;
+		break;
+	default:
+		warning("Unknown GID");
+		return Common::kUnsupportedGameidError;
+	}
 
 	if (ConfMan.hasKey("save_slot")) {
 		loadGameState(ConfMan.getInt("save_slot"));
diff --git a/engines/ngi/ngi.h b/engines/ngi/ngi.h
index edd6ab6262..ca75bc867e 100644
--- a/engines/ngi/ngi.h
+++ b/engines/ngi/ngi.h
@@ -132,6 +132,7 @@ public:
 	bool isDemo();
 	Common::Language getLanguage() const;
 	const char *getGameId() const;
+	int getGameGID() const;
 
 	Common::RandomSource _rnd;