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

[phcoder]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bf95593580 MADS: Simplify name reading in mps_installer.cpp
a08cc827ec MADS: Fix detection entry for Rex Nebular floppy installer
e347b9957f MADS: Add Rex Nebular 5.25" floppy installer entry


Commit: bf95593580a2d0adf20abeae1ddb2c16822d561a
    https://github.com/scummvm/scummvm/commit/bf95593580a2d0adf20abeae1ddb2c16822d561a
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-29T04:33:08+01:00

Commit Message:
MADS: Simplify name reading in mps_installer.cpp

Changed paths:
    engines/mads/mps_installer.cpp


diff --git a/engines/mads/mps_installer.cpp b/engines/mads/mps_installer.cpp
index d2ccc9a6bc5..44639ebed26 100644
--- a/engines/mads/mps_installer.cpp
+++ b/engines/mads/mps_installer.cpp
@@ -50,21 +50,12 @@ MpsInstaller* MpsInstaller::open(const Common::Path& baseName) {
 		filecnt = (indexSize - 12) / kEntryLength;
 
 	for (uint i = 0; i < filecnt; i++) {
-		char nameField[kNameFieldLength];
-		int nameLen = kNameFieldLength;
-		indexFile.read(nameField, kNameFieldLength);
-		for (uint j = 0; j < kNameFieldLength; j++) {
-			if (!nameField[j]) {
-				nameLen = j;
-				break;
-			}
-		}
+		Common::String name = indexFile.readString('\0', kNameFieldLength);
 		uint16 compression = indexFile.readUint16LE();
 		uint16 volumeNumber = indexFile.readUint16LE();
 		uint32 offsetInVolume = indexFile.readUint32LE();
 		uint32 compressedSize = indexFile.readUint32LE();
 		uint32 uncompressedSize = indexFile.readUint32LE();
-		Common::String name(nameField, nameLen);
 		FileDescriptor desc(name, compression, volumeNumber, offsetInVolume, compressedSize, uncompressedSize);
 		_files[desc._fileName] = desc;
 	}


Commit: a08cc827ecdaaa91abd3f8c0e4a5e47afbfc9f79
    https://github.com/scummvm/scummvm/commit/a08cc827ecdaaa91abd3f8c0e4a5e47afbfc9f79
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-29T04:33:36+01:00

Commit Message:
MADS: Fix detection entry for Rex Nebular floppy installer

Looks like my copy was slightly corrupted. Since my disk died 2 days later
I can't check how exactly it was corrupted. Backup has a different checksum
Just change to a known good value. If current value turns out that there are 2
variants, then we can add a variant later

Changed paths:
    engines/mads/detection_tables.h


diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index ade028541d7..7f80499d8c2 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -27,7 +27,7 @@ static const MADSGameDescription gameDescriptions[] = {
 		{
 			"nebular",
 			0,
-			AD_ENTRY2s("mpslabs.001", "4df5c557b52abb5b661cf4befe5ae301", 1315354, "mpslabs.idx", "d74bed6513d0a5d514269750f574a23b", 5598),
+			AD_ENTRY2s("mpslabs.001", "4df5c557b52abb5b661cf4befe5ae301", 1315354, "mpslabs.idx", "598ede8e361a60a4e577bbe40f83295b", 5598),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			GF_INSTALLER,


Commit: e347b9957f92939d7ff4393bc83976fe1ce151d0
    https://github.com/scummvm/scummvm/commit/e347b9957f92939d7ff4393bc83976fe1ce151d0
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-29T04:34:03+01:00

Commit Message:
MADS: Add Rex Nebular 5.25" floppy installer entry

Changed paths:
    engines/mads/detection_tables.h


diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index 7f80499d8c2..1d12f61e167 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -23,10 +23,10 @@ namespace MADS {
 
 static const MADSGameDescription gameDescriptions[] = {
 	{
-		// Rex Nebular and the Cosmic Gender Bender DOS English (compressed)
+		// Rex Nebular and the Cosmic Gender Bender DOS English (compressed, 3.5" floppy installer)
 		{
 			"nebular",
-			0,
+			"3.5 inch floppy installer",
 			AD_ENTRY2s("mpslabs.001", "4df5c557b52abb5b661cf4befe5ae301", 1315354, "mpslabs.idx", "598ede8e361a60a4e577bbe40f83295b", 5598),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
@@ -40,9 +40,27 @@ static const MADSGameDescription gameDescriptions[] = {
 		GType_RexNebular,
 		0
 	},
+	{
+		// Rex Nebular and the Cosmic Gender Bender DOS English (compressed, 5.25" floppy installer)
+		{
+			"nebular",
+			"5.25 inch floppy installer",
+			AD_ENTRY2s("mpslabs.001", "4df5c557b52abb5b661cf4befe5ae301", 1071642, "mpslabs.idx", "d8fac57aac1c0c41ba3a1554ccc89d21", 5500),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			GF_INSTALLER,
+#ifdef USE_TTS
+			GUIO6(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE, GAMEOPTION_TTS_NARRATOR)
+#else
+			GUIO5(GUIO_NOSPEECH, GAMEOPTION_EASY_MOUSE, GAMEOPTION_ANIMATED_INVENTORY, GAMEOPTION_ANIMATED_INTERFACE, GAMEOPTION_NAUGHTY_MODE)
+#endif
+		},
+		GType_RexNebular,
+		0
+	},
 
 	{
-		// Rex Nebular and the Cosmic Gender Bender DOS English
+		// Rex Nebular and the Cosmic Gender Bender DOS English, same as 2 entries above but uncompressed
 		{
 			"nebular",
 			0,