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

sev- sev at scummvm.org
Sun Feb 19 17:30:59 CET 2017


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:
ea0969779f DIRECTOR: Added detection for The Apartment 2.0
c010e05edd DIRECTOR: Hide assert() in Text Cast reading


Commit: ea0969779f7d67614c920640533d86107fdcc5cb
    https://github.com/scummvm/scummvm/commit/ea0969779f7d67614c920640533d86107fdcc5cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-19T17:30:49+01:00

Commit Message:
DIRECTOR: Added detection for The Apartment 2.0

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 95ddd25..11f70e0 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -69,8 +69,21 @@ static const DirectorGameDescription gameDescriptions[] = {
 	{
 		{
 			"theapartment",
+			"D2",
+			AD_ENTRY1s("Main Menu", "fc56c179cb8c6d4938e61ee61fd0032c", 48325),	// Original name is "•Main Menu"
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		2
+	},
+	{
+		{
+			"theapartment",
 			"D3",
-			AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911),
+			AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911),	// Original name is "•Main Menu"
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_MACRESFORK,
@@ -83,7 +96,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 		{
 			"theapartment",
 			"D4",
-			AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612),
+			AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612),// Original name is "•Main Menu"
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_NO_FLAGS,


Commit: c010e05edd8343d90d2a87ff490002b3c6ec8b5e
    https://github.com/scummvm/scummvm/commit/c010e05edd8343d90d2a87ff490002b3c6ec8b5e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-19T17:30:49+01:00

Commit Message:
DIRECTOR: Hide assert() in Text Cast reading

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 8b1e57c..ed5b056 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -95,7 +95,9 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
 		palinfo3 = stream.readUint16();
 
 		int t = stream.readUint32();
-		assert(t == 0); // So far we saw only 0 here
+		if (t != 0) { // In D2 there are values
+			warning("TextCast: t: %x", t);
+		}
 
 		initialRect = Score::readRect(stream);
 		textShadow = static_cast<SizeType>(stream.readByte());





More information about the Scummvm-git-logs mailing list