[Scummvm-git-logs] scummvm master -> 6eaa7df0bc7342703615737ded61f68079333484

[whiterandrek]

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:
6eaa7df0bc PINK: added loading of thumbnail only when necessary


Commit: 6eaa7df0bc7342703615737ded61f68079333484
    https://github.com/scummvm/scummvm/commit/6eaa7df0bc7342703615737ded61f68079333484
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T12:56:20+03:00

Commit Message:
PINK: added loading of thumbnail only when necessary

Changed paths:
    engines/pink/detection.cpp
    engines/pink/pink.h
    engines/pink/saveload.cpp


diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index 3e3e177..c6715d1 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -108,7 +108,7 @@ SaveStateDescriptor PinkMetaEngine::querySaveMetaInfos(const char *target, int s
 
 	if (f) {
 		SaveStateDescriptor desc;
-		if (!Pink::readSaveHeader(*f.get(), desc))
+		if (!Pink::readSaveHeader(*f.get(), desc, false))
 			return SaveStateDescriptor();
 
 		return desc;
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index 637a244..e5dc407 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -149,7 +149,7 @@ private:
 	const ADGameDescription _desc;
 };
 
-bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc);
+WARN_UNUSED_RESULT bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc, bool skipThumbnail = true);
 Common::String generateSaveName(int slot, const char *gameId);
 
 } // End of namespace Pink
diff --git a/engines/pink/saveload.cpp b/engines/pink/saveload.cpp
index c87ea3c..27e8d95 100644
--- a/engines/pink/saveload.cpp
+++ b/engines/pink/saveload.cpp
@@ -83,7 +83,7 @@ Common::String generateSaveName(int slot, const char *gameId) {
 	return Common::String::format("%s.s%02d", gameId, slot);
 }
 
-bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc) {
+WARN_UNUSED_RESULT bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc, bool skipThumbnail) {
 	if (in.readUint32BE() != MKTAG('p', 'i', 'n', 'k'))
 		return false;
 
@@ -91,11 +91,9 @@ bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc) {
 	uint32 date = in.readUint32LE();
 	uint16 time = in.readUint16LE();
 	uint32 playTime = in.readUint32LE();
-	if (!Graphics::checkThumbnailHeader(in))
-		return false;
 
-	Graphics::Surface *thumbnail;
-	if (!Graphics::loadThumbnail(in, thumbnail))
+	Graphics::Surface *thumbnail = nullptr;
+	if (!Graphics::loadThumbnail(in, thumbnail, skipThumbnail))
 		return false;
 
 	int day = (date >> 24) & 0xFF;