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

[bonki]

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:
abe9f0fa15 FULLPIPE: Use zero playtime when filling dummy header
c750a8e6be FULLPIPE: Fix playtime not being read from savegames


Commit: abe9f0fa15f37d12dd5da7358dbb3d912bc98f1a
    https://github.com/scummvm/scummvm/commit/abe9f0fa15f37d12dd5da7358dbb3d912bc98f1a
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-24T23:38:34+01:00

Commit Message:
FULLPIPE: Use zero playtime when filling dummy header

This is a tad more meaningful than a random value, especially should we
for some reason use dummy header information to actually set playtime in
the future.

Changed paths:
    engines/fullpipe/stateloader.cpp


diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 703190b..2424d8f 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -185,7 +185,7 @@ void fillDummyHeader(Fullpipe::FullpipeSavegameHeader &header) {
 	// This is wrong header, perhaps it is original savegame. Thus fill out dummy values
 	header.date = (20 << 24) | (9 << 16) | 2016;
 	header.time = (9 << 8) | 56;
-	header.playtime = 1000;
+	header.playtime = 0;
 }
 
 bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header) {


Commit: c750a8e6be9dc69cd2ba7bd4b7b17b0f7ee7b313
    https://github.com/scummvm/scummvm/commit/c750a8e6be9dc69cd2ba7bd4b7b17b0f7ee7b313
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-24T23:38:36+01:00

Commit Message:
FULLPIPE: Fix playtime not being read from savegames

Fixes Trac#10394.

Changed paths:
    engines/fullpipe/stateloader.cpp


diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 2424d8f..9d4d5ab 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -69,6 +69,11 @@ bool GameLoader::readSavegame(const char *fname) {
 	Common::Array<byte> map(800);
 	saveFile->read(map.data(), 800);
 
+	FullpipeSavegameHeader header2;
+	if (Fullpipe::readSavegameHeader(saveFile.get(), header2)) {
+		g_fp->setTotalPlayTime(header2.playtime * 1000);
+	}
+
 	{
 		Common::MemoryReadStream tempStream(map.data(), 800, DisposeAfterUse::NO);
 		MfcArchive temp(&tempStream);