diff options
| author | Norbert Lange | 2009-07-19 19:56:52 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-19 19:56:52 +0000 |
| commit | 4ae0b0528be2f054ada2c3641d419d2e64a01343 (patch) | |
| tree | a4b79eae2746de03aa60bbd99a5cf5edd1e4e4b1 | |
| parent | 65cf95b98bf4ed6c7a4cbb30aca343ebc52a69a5 (diff) | |
| download | scummvm-rg350-4ae0b0528be2f054ada2c3641d419d2e64a01343.tar.gz scummvm-rg350-4ae0b0528be2f054ada2c3641d419d2e64a01343.tar.bz2 scummvm-rg350-4ae0b0528be2f054ada2c3641d419d2e64a01343.zip | |
now using tick for fadeout through the nowmal delay function
svn-id: r42622
| -rw-r--r-- | engines/kyra/sound_amiga.cpp | 5 | ||||
| -rw-r--r-- | tfmx/mxtxplayer.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index f01af1e37a..59f1eaf4cd 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -132,12 +132,11 @@ void SoundAmiga::haltTrack() { void SoundAmiga::beginFadeOut() { for (int i = 0x3F; i >= 0; --i) { _driver->setVolume((byte)i); - // TODO: use _tickLength or delayWithTicks but thats bugged - _vm->delay(1000 / 60); + _vm->delay(_vm->tickLength()); } _driver->stopMusic(); - _vm->delay(1000 / 60); + _vm->delay(_vm->tickLength()); _driver->setVolume(0x40); } diff --git a/tfmx/mxtxplayer.cpp b/tfmx/mxtxplayer.cpp index 0790d7ac70..524626a972 100644 --- a/tfmx/mxtxplayer.cpp +++ b/tfmx/mxtxplayer.cpp @@ -89,7 +89,7 @@ void modcmdmain(const int argc, const char *const argv[]) { if (!hasCmd) { player->playSong(0); - player->playNote(0x18, 0x03, 0x0F52, 120, 1); + //player->playNote(0x18, 0x03, 0x0F52, 120, 1); } int maxsecs = 10 * 60; |