diff options
| author | Norbert Lange | 2009-07-19 16:59:39 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-19 16:59:39 +0000 |
| commit | 65cf95b98bf4ed6c7a4cbb30aca343ebc52a69a5 (patch) | |
| tree | 67f53eb265c1e1bd87b7ae53c593226c1f651c3c /engines/kyra/sound_amiga.cpp | |
| parent | f051e7e9ab9e2880937c1a1c0097778e8018fabd (diff) | |
| download | scummvm-rg350-65cf95b98bf4ed6c7a4cbb30aca343ebc52a69a5.tar.gz scummvm-rg350-65cf95b98bf4ed6c7a4cbb30aca343ebc52a69a5.tar.bz2 scummvm-rg350-65cf95b98bf4ed6c7a4cbb30aca343ebc52a69a5.zip | |
reverted fadeout to using plain delay as delayWithTicks crashes >(
svn-id: r42621
Diffstat (limited to 'engines/kyra/sound_amiga.cpp')
| -rw-r--r-- | engines/kyra/sound_amiga.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 3de560a207..f01af1e37a 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -45,6 +45,7 @@ SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer) } SoundAmiga::~SoundAmiga() { + _mixer->stopHandle(_musicHandle); delete _driver; } @@ -131,11 +132,12 @@ void SoundAmiga::haltTrack() { void SoundAmiga::beginFadeOut() { for (int i = 0x3F; i >= 0; --i) { _driver->setVolume((byte)i); - _vm->delayWithTicks(1); + // TODO: use _tickLength or delayWithTicks but thats bugged + _vm->delay(1000 / 60); } _driver->stopMusic(); - _vm->delayWithTicks(1); + _vm->delay(1000 / 60); _driver->setVolume(0x40); } |