diff options
| author | Sven Hesse | 2007-01-25 14:18:12 +0000 |
|---|---|---|
| committer | Sven Hesse | 2007-01-25 14:18:12 +0000 |
| commit | 604077827f44d027e7c3afd3200afe1a901e1c2a (patch) | |
| tree | 36049c29fb3533a4725d1e4c1189f16b8c63503e /engines/gob/mult_v2.cpp | |
| parent | 30b7ac3db529c80d71d89ee41a09bce3d9076309 (diff) | |
| download | scummvm-rg350-604077827f44d027e7c3afd3200afe1a901e1c2a.tar.gz scummvm-rg350-604077827f44d027e7c3afd3200afe1a901e1c2a.tar.bz2 scummvm-rg350-604077827f44d027e7c3afd3200afe1a901e1c2a.zip | |
- Some clean-up
- Fixed sound playing and looping
- Changed Paula to use non-absolute panning, defaulting to 0.25/0.75 and 0.75/0.25, as per madmoose's suggestion
- Prepared/Cleaned-up Paula and Infogrames for the move to sound/mods/
svn-id: r25189
Diffstat (limited to 'engines/gob/mult_v2.cpp')
| -rw-r--r-- | engines/gob/mult_v2.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index c582957e12..70ccb1ffd5 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -516,7 +516,6 @@ void Mult_v2::playMult(int16 startFrame, int16 endFrame, char checkEscape, } do { - _vm->_snd->loopSounds(); stop = 1; if (VAR(58) == 0) { @@ -540,6 +539,7 @@ void Mult_v2::playMult(int16 startFrame, int16 endFrame, char checkEscape, stop = doFadeAnim(stop); stop = doSoundAnim(stop, _frame); + _vm->_snd->loopSounds(); if (_frame >= endFrame) stopNoClear = 1; @@ -1318,18 +1318,7 @@ void Mult_v2::animate(void) { void Mult_v2::playSound(Snd::SoundDesc * soundDesc, int16 repCount, int16 freq, int16 channel) { -// warning("playSound, %d, %d, %d", repCount, freq, channel); - if (soundDesc->frequency >= 0) { - if (soundDesc->frequency == freq) - _vm->_snd->playSample(soundDesc, repCount, -channel); - else - _vm->_snd->playSample(soundDesc, repCount, freq); - } else { - if (soundDesc->frequency == -freq) - _vm->_snd->playSample(soundDesc, repCount, -channel); - else - _vm->_snd->playSample(soundDesc, repCount, freq); - } + _vm->_snd->playSample(soundDesc, repCount, freq); } void Mult_v2::freeMult(void) { |