[Scummvm-git-logs] scummvm master -> 565a0559ed09660daa83cd529afa4e0efb6949c5

[antoniou79]

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:
565a0559ed STARK: Skip loading bg dialog color for Steam version r161


Commit: 565a0559ed09660daa83cd529afa4e0efb6949c5
    https://github.com/scummvm/scummvm/commit/565a0559ed09660daa83cd529afa4e0efb6949c5
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-08-27T18:37:35+03:00

Commit Message:
STARK: Skip loading bg dialog color for Steam version r161

Addresses bug https://bugs.scummvm.org/ticket/12762

Changed paths:
    engines/stark/ui/dialogbox.cpp


diff --git a/engines/stark/ui/dialogbox.cpp b/engines/stark/ui/dialogbox.cpp
index 3882d78803..29c972b2eb 100644
--- a/engines/stark/ui/dialogbox.cpp
+++ b/engines/stark/ui/dialogbox.cpp
@@ -223,6 +223,21 @@ Graphics::Surface *DialogBox::loadBackground() {
 		return nullptr;
 	}
 
+	// As of Aug 2021:
+	// Steam version of The Longest Journey is 1.0.0.161 "Enno's two-CD Version"
+	// GOG version of The Longest Journey is 1.0.0.142 "RC1" (Special Build: "Paper Sun")
+	// Steam's game.exe does not contain a valid resource for the background bitmap id 147
+	// so we skip trying to retrieve it based on build number.
+	Common::WinResources::VersionInfo *versionInfo = executable.getVersionResource(1);
+	if (versionInfo
+	    && versionInfo->fileVersion[0] == 1
+	    && versionInfo->fileVersion[1] == 0
+	    && versionInfo->fileVersion[2] == 0
+	    && versionInfo->fileVersion[3] == 161) {
+		warning("Steam version does not contain the modal dialog background bitmap in 'game.exe'. Using fallback color for dialog background...");
+		return nullptr;
+	}
+
 	Common::SeekableReadStream *stream = executable.getResource(Common::kWinBitmap, 147);
 	if (!stream) {
 		warning("Unable to find the modal dialog background bitmap in 'game.exe'");