[Scummvm-git-logs] scummvm master -> 7aff24cfc69e07997c1b8e2da7e8c950e8a08e2f

[sev-]

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:
7aff24cfc6 NGI: MDREAM: Read GameProject


Commit: 7aff24cfc69e07997c1b8e2da7e8c950e8a08e2f
    https://github.com/scummvm/scummvm/commit/7aff24cfc69e07997c1b8e2da7e8c950e8a08e2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-05T01:25:35+02:00

Commit Message:
NGI: MDREAM: Read GameProject

Changed paths:
    engines/ngi/gameloader.cpp
    engines/ngi/stateloader.cpp


diff --git a/engines/ngi/gameloader.cpp b/engines/ngi/gameloader.cpp
index b1724603b0..cad79a581a 100644
--- a/engines/ngi/gameloader.cpp
+++ b/engines/ngi/gameloader.cpp
@@ -114,7 +114,7 @@ bool GameLoader::load(MfcArchive &file) {
 	g_nmi->_gameProject = _gameProject.get();
 
 	if (g_nmi->_gameProjectVersion < 12) {
-		error("Old gameProjectVersion: %d", g_nmi->_gameProjectVersion);
+		error("GameLoader::load(): old gameProjectVersion: %d", g_nmi->_gameProjectVersion);
 	}
 
 	_gameName = file.readPascalString();
diff --git a/engines/ngi/stateloader.cpp b/engines/ngi/stateloader.cpp
index 1fbc3a2e25..b26cdd6804 100644
--- a/engines/ngi/stateloader.cpp
+++ b/engines/ngi/stateloader.cpp
@@ -366,7 +366,11 @@ bool GameProject::load(MfcArchive &file) {
 	_field_4 = 0;
 	_field_10 = 12;
 
-	g_nmi->_gameProjectVersion = file.readUint32LE();
+	if (g_nmi->getGameGID() == GID_MDREAM)
+		g_nmi->_gameProjectVersion = 1;
+	else
+		g_nmi->_gameProjectVersion = file.readUint32LE();
+
 	g_nmi->_pictureScale = file.readUint16LE();
 	g_nmi->_scrollSpeed = file.readUint32LE();
 
@@ -377,9 +381,6 @@ bool GameProject::load(MfcArchive &file) {
 	debugC(1, kDebugLoading, "_scrollSpeed = %d", g_nmi->_scrollSpeed);
 	debugC(1, kDebugLoading, "_headerFilename = %s", _headerFilename.c_str());
 
-	if (g_nmi->getGameGID() == GID_MDREAM)
-		return false;
-
 	_sceneTagList.reset(new SceneTagList());
 
 	_sceneTagList->load(file);