[Scummvm-cvs-logs] scummvm master -> d6c1e70033315363ff052cec145f08f759664d1f

[clone2727]

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:
ee223528fc SCUMM: Add support for an alternate version of The Dig's demo
d6c1e70033 MOHAWK: Add detection for the seussabc Mac demo


Commit: ee223528fc3588b54957b872a2daad47919d807f
    https://github.com/scummvm/scummvm/commit/ee223528fc3588b54957b872a2daad47919d807f
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-05-02T08:24:04-07:00

Commit Message:
SCUMM: Add support for an alternate version of The Dig's demo

Changed paths:
    engines/scumm/detection_tables.h
    engines/scumm/sound.cpp



diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index d66798c..952abdb 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -483,6 +483,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 
 #ifdef ENABLE_SCUMM_7_8
 	{ "dig", "dig.la%d", kGenDiskNum, UNK_LANG, UNK, 0 },
+	{ "dig", "thedig.la%d", kGenDiskNum, UNK_LANG, UNK, "Demo" }, // Used by an alternate version of the demo
 	{ "dig", "The Dig Data", kGenUnchanged, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "dig", "The Dig Demo Data", kGenUnchanged, UNK_LANG, Common::kPlatformMacintosh, "Demo" },
 
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 54f35c1..a381195 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -527,6 +527,10 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 		sprintf(filename, "audio/%s.%d/%d.voc", roomname, offset, b);
 		_vm->openFile(*_sfxFile, filename);
 		if (!_sfxFile->isOpen()) {
+			sprintf(filename, "audio/%s_%d/%d.voc", roomname, offset, b);
+			_vm->openFile(*_sfxFile, filename);
+		}
+		if (!_sfxFile->isOpen()) {
 			sprintf(filename, "%d.%d.voc", offset, b);
 			_vm->openFile(*_sfxFile, filename);
 		}


Commit: d6c1e70033315363ff052cec145f08f759664d1f
    https://github.com/scummvm/scummvm/commit/d6c1e70033315363ff052cec145f08f759664d1f
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-05-02T08:24:04-07:00

Commit Message:
MOHAWK: Add detection for the seussabc Mac demo

Changed paths:
    engines/mohawk/detection_tables.h



diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index ae9d8ee..36dbcbd 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -793,6 +793,21 @@ static const MohawkGameDescription gameDescriptions[] = {
 
 	{
 		{
+			"seussabc",
+			"Demo",
+			AD_ENTRY1("BookOutline", "17d72660680ae32cd7c560d0cf04d2ef"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_DEMO,
+			Common::GUIO_NONE
+		},
+		GType_LIVINGBOOKSV2,
+		GF_DEMO,
+		0
+	},
+
+	{
+		{
 			"1stdegree",
 			"",
 			AD_ENTRY1("AL236_1.MHK", "3ba145492a7b8b4dee0ef4222c5639c3"),