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

[bluegr]

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:
7aa824372e SCI: Adapt aggretate initialization for pre-C++11 compilers


Commit: 7aa824372e62835571ddd847417f479a5498f1f2
    https://github.com/scummvm/scummvm/commit/7aa824372e62835571ddd847417f479a5498f1f2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-19T22:42:13+02:00

Commit Message:
SCI: Adapt aggretate initialization for pre-C++11 compilers

Changed paths:
    engines/sci/resource_patcher.cpp
    engines/sci/resource_patcher.h


diff --git a/engines/sci/resource_patcher.cpp b/engines/sci/resource_patcher.cpp
index 84d2c60..d0b5d17 100644
--- a/engines/sci/resource_patcher.cpp
+++ b/engines/sci/resource_patcher.cpp
@@ -617,7 +617,7 @@ ResourcePatcher::PatchSizes ResourcePatcher::calculatePatchSizes(const byte *pat
 		}
 	}
 
-	return { dataSize, deltaSize };
+	return PatchSizes(dataSize, deltaSize);
 }
 
 int32 ResourcePatcher::readBlockSize(const byte * &patchData) const {
diff --git a/engines/sci/resource_patcher.h b/engines/sci/resource_patcher.h
index 860e4a6..2b365ad 100644
--- a/engines/sci/resource_patcher.h
+++ b/engines/sci/resource_patcher.h
@@ -115,6 +115,11 @@ private:
 		 * data.
 		 */
 		int32 delta;
+
+		PatchSizes(uint32 exp, int32 d) {
+			expected = exp;
+			delta = d;
+		}
 	};
 
 	typedef Common::Array<GameResourcePatch> PatchList;