[Scummvm-git-logs] scummvm master -> 9158595aa1e6587e130435497277353dc0b8a235

[elasota]

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:
aa28802705 MTROPOLIS: Coverty issue cleanup.
9158595aa1 VCRUISE: Split Reah English DVD and digital versions.  Add English Digital + German Community Patch.


Commit: aa28802705288419ed4e3269d8b2c72824e91ecb
    https://github.com/scummvm/scummvm/commit/aa28802705288419ed4e3269d8b2c72824e91ecb
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-08T20:03:08-04:00

Commit Message:
MTROPOLIS: Coverty issue cleanup.

Changed paths:
    engines/mtropolis/runtime.cpp
    engines/mtropolis/runtime.h


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 3ef6f211fe6..b59ab6e3b1b 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -840,6 +840,9 @@ bool DynamicList::setAtIndex(size_t index, const DynamicValue &value) {
 		} else {
 			clear();
 			changeToType(value.getType());
+
+			assert(_container);
+
 			return _container->setAtIndex(index, value);
 		}
 	} else {
@@ -6875,7 +6878,7 @@ Project::Segment::Segment() : weakStream(nullptr) {
 Project::StreamDesc::StreamDesc() : streamType(kStreamTypeUnknown), segmentIndex(0), size(0), pos(0) {
 }
 
-Project::AssetDesc::AssetDesc() : typeCode(0), id(0) {
+Project::AssetDesc::AssetDesc() : typeCode(0), id(0), streamID(0) {
 }
 
 Project::Project(Runtime *runtime)
@@ -8000,7 +8003,6 @@ void VisualElementRenderProperties::clearDirty() {
 	_isDirty = false;
 }
 
-/*
 VisualElementRenderProperties &VisualElementRenderProperties::operator=(const VisualElementRenderProperties &other) {
 	_inkMode = other._inkMode;
 	_shape = other._shape;
@@ -8017,10 +8019,9 @@ VisualElementRenderProperties &VisualElementRenderProperties::operator=(const Vi
 
 	return *this;
 }
-*/
 
 VisualElement::VisualElement()
-	: _rect(0, 0, 0, 0), _cachedAbsoluteOrigin(Common::Point(0, 0)), _contentsDirty(true), _directToScreen(false), _visible(false), _layer(0) {
+	: _rect(0, 0, 0, 0), _cachedAbsoluteOrigin(Common::Point(0, 0)), _contentsDirty(true), _directToScreen(false), _visible(false), _visibleByDefault(true), _layer(0) {
 }
 
 bool VisualElement::isVisual() const {
diff --git a/engines/mtropolis/runtime.h b/engines/mtropolis/runtime.h
index 04a4660f0d2..8d94ebae0b1 100644
--- a/engines/mtropolis/runtime.h
+++ b/engines/mtropolis/runtime.h
@@ -911,6 +911,7 @@ private:
 	bool convertToTypeNoDereference(DynamicValueTypes::DynamicValueType targetType, DynamicValue &result) const;
 
 	void setFromOther(const DynamicValue &other);
+	void setFromOther(DynamicValue &&other);
 
 	DynamicValueTypes::DynamicValueType _type;
 	ValueUnion _value;
@@ -2614,6 +2615,7 @@ private:
 class VisualElementRenderProperties {
 public:
 	VisualElementRenderProperties();
+	VisualElementRenderProperties(const VisualElementRenderProperties &) = default;
 
 	enum InkMode {
 		kInkModeCopy = 0x0,
@@ -2677,7 +2679,7 @@ public:
 	bool isDirty() const;
 	void clearDirty();
 
-	//VisualElementRenderProperties &operator=(const VisualElementRenderProperties &other);
+	VisualElementRenderProperties &operator=(const VisualElementRenderProperties &other);
 
 private:
 	InkMode _inkMode;


Commit: 9158595aa1e6587e130435497277353dc0b8a235
    https://github.com/scummvm/scummvm/commit/9158595aa1e6587e130435497277353dc0b8a235
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-08T20:05:26-04:00

Commit Message:
VCRUISE: Split Reah English DVD and digital versions.  Add English Digital + German Community Patch.

Changed paths:
    engines/vcruise/detection_tables.h


diff --git a/engines/vcruise/detection_tables.h b/engines/vcruise/detection_tables.h
index 596a77141d5..cb7c7edae94 100644
--- a/engines/vcruise/detection_tables.h
+++ b/engines/vcruise/detection_tables.h
@@ -29,11 +29,24 @@
 namespace VCruise {
 
 static const VCruiseGameDescription gameDescriptions[] = {
-
-	{ // Reah: Face the Unknown, English DVD/digital version
+	{ // Reah: Face the Unknown, English DVD version
 		{
 			"reah",
 			"English DVD",
+			AD_ENTRY2s("Reah.exe", "69aa9832338db3f40f616386e54857e8", 304128,
+					   "0170_b.wav", "5b705300b4fee3ceb821a1b55884a722", 129248),
+			Common::UNK_LANG,
+			Common::kPlatformWindows,
+			ADGF_TESTING | VCRUISE_GF_WANT_MP3,
+			GUIO0()
+		},
+		GID_REAH,
+		Common::EN_ANY,
+	},
+	{ // Reah: Face the Unknown, English digital (GOG) version
+		{
+			"reah",
+			"English Digital + German Community Patch",
 			AD_ENTRY2s("Reah.exe", "60ec19c53f1323cc7f0314f98d396283", 304128,
 					   "0170_b.wav", "5b705300b4fee3ceb821a1b55884a722", 129248),
 			Common::UNK_LANG,
@@ -58,8 +71,7 @@ static const VCruiseGameDescription gameDescriptions[] = {
 		GID_REAH,
 		Common::EN_ANY,
 	},
-	{
-		// Reah: Face the Unknown, German 6 CD Version
+	{ // Reah: Face the Unknown, German 6 CD Version
 		{
 			"reah",
 			"German CD",
@@ -73,6 +85,20 @@ static const VCruiseGameDescription gameDescriptions[] = {
 		GID_REAH,
 		Common::DE_DEU,
 	},
+	{ // Reah: Face the Unknown, English digital (GOG) version + German VO community patch
+		{
+			"reah",
+			"English Digital + German Community Patch",
+			AD_ENTRY2s("Reah.exe", "60ec19c53f1323cc7f0314f98d396283", 304128,
+					   "0170_b.wav", "5f84af02d1193ce9c47fe0dc821f0613", 121220),
+			Common::UNK_LANG,
+			Common::kPlatformWindows,
+			ADGF_TESTING | VCRUISE_GF_WANT_MP3,
+			GUIO0()
+		},
+		GID_REAH,
+		Common::EN_ANY,
+	},
 	{ // Schizm: Mysterious Journey, English DVD/digital Version
 		{
 			"schizm",