[Scummvm-git-logs] scummvm master -> 093bee188936f6e99b81ec855dc061b7c1310eb9

[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:
093bee1889 PINK: Warn when the timestamps mismatch


Commit: 093bee188936f6e99b81ec855dc061b7c1310eb9
    https://github.com/scummvm/scummvm/commit/093bee188936f6e99b81ec855dc061b7c1310eb9
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-07-29T18:55:25+02:00

Commit Message:
PINK: Warn when the timestamps mismatch

Changed paths:
    engines/pink/pink.cpp


diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 67f9d167ba..3aa256712c 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -94,8 +94,16 @@ Common::Error PinkEngine::init() {
 		orbName = "HPP.ORB";
 	}
 
-	if (!_orb.open(orbName) || (_bro && !_bro->open(broName) && _orb.getTimestamp() == _bro->getTimestamp()))
+	if (!_orb.open(orbName))
 		return Common::kNoGameDataFoundError;
+	if (_bro) {
+		if (!_bro->open(broName))
+			return Common::kNoGameDataFoundError;
+		if (_orb.getTimestamp() != _bro->getTimestamp()) {
+			warning("ORB and BRO timestamp mismatch. %lx != %lx", _orb.getTimestamp(), _bro->getTimestamp());
+			return Common::kNoGameDataFoundError;
+		}
+	}
 
 	if (!loadCursors())
 		return Common::kNoGameDataFoundError;