diff options
| author | Travis Howell | 2005-04-29 15:33:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-29 15:33:07 +0000 |
| commit | ce909a35b3ba692798e5d74d113d1c5e1890a0c0 (patch) | |
| tree | d19281e9558ee98c7278823348a183ce6a84b3c1 | |
| parent | 3911fc6edb6b28cf895719deb260d416130517f0 (diff) | |
| download | scummvm-rg350-ce909a35b3ba692798e5d74d113d1c5e1890a0c0.tar.gz scummvm-rg350-ce909a35b3ba692798e5d74d113d1c5e1890a0c0.tar.bz2 scummvm-rg350-ce909a35b3ba692798e5d74d113d1c5e1890a0c0.zip | |
Some sound resources in soccer2004 are compressed too.
Add Moonbase demo, as testing target only.
svn-id: r17866
| -rw-r--r-- | scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 9ac888760f..5cc818b037 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -465,6 +465,8 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { {"7f45ddd6dbfbf8f80c0c0efea4c295bc", "Maniac Mansion (v1)", GID_MANIAC, 1, 0, 25, MDT_PCSPK, GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, Common::kPlatformUnknown, 0, 0}, + {"ef71a322b6530ac45b1a070f7c0795f7", "Moonbase Commander (Demo)", GID_HEGAME, 6, 100, 62, MDT_NONE, + GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_LOCALIZED, Common::kPlatformUnknown, 0, 0}, {"37aed3f91c1ef959e0bd265f9b13781f", "Pajama Sam: No Need To Hide When It's Dark Outside (Updated)", GID_HEGAME, 6, 100, 61, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformUnknown, 0, 0}, // PajamaNHD diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 8226c204d7..e759b52275 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -294,7 +294,8 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { Common::MemoryReadStream stream(ptr, size); if (!loadWAVFromStream(stream, size, rate, flags)) { - error("playSound: Not a valid WAV file"); + warning("playSound: IMA ADPCM compression not supported"); + return; } // Allocate a sound buffer, copy the data into it, and play |