diff options
| author | Max Horn | 2009-07-29 18:35:34 +0000 |
|---|---|---|
| committer | Max Horn | 2009-07-29 18:35:34 +0000 |
| commit | 2205541e863101ec324372a864dc73a36730de99 (patch) | |
| tree | efbb6d1287a072aeb4f7470a251bce9e7068ad38 /engines | |
| parent | 057028088545f3c3688a5d44550e616a29d5578e (diff) | |
| download | scummvm-rg350-2205541e863101ec324372a864dc73a36730de99.tar.gz scummvm-rg350-2205541e863101ec324372a864dc73a36730de99.tar.bz2 scummvm-rg350-2205541e863101ec324372a864dc73a36730de99.zip | |
SCUMM: Enable looping in Indy3Mac sound effects
svn-id: r42898
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/script.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 9da14cada6..fd1ed6f1e4 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1179,7 +1179,7 @@ void ScummEngine::runInputScript(int clickArea, int val, int mode) { args[4] = VAR(VAR_VIRT_MOUSE_Y); } - // Macintosh verison of indy3ega used different interface, so adjust values. + // Macintosh version of indy3ega used different interface, so adjust values. if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) { if (clickArea == kVerbClickArea && (val >= 101 && val <= 108)) { if (val == 107) { diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index ad48029bd2..dc7f942668 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -420,17 +420,16 @@ void Sound::playSound(int soundID) { sound = (char *)malloc(size); int vol = ptr[24] * 4; int loopStart = 0, loopEnd = 0; -#if 0 // Disabling this until after 0.11.0 int loopcount = ptr[27]; if (loopcount > 1) { // TODO: We can only loop once, or infinitely many times, but // have no support for a finite number of repetitions. - // This is + // So far, I have seen only 1 and 255 (for infinite repetitions), + // so maybe this is not really a problem. loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8); loopEnd = READ_BE_UINT16(ptr + 14); flags |= Audio::Mixer::FLAG_LOOP; } -#endif memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size); _mixer->playRaw(Audio::Mixer::kSFXSoundType, NULL, sound, size, rate, |