aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Lange2009-07-19 15:36:11 +0000
committerNorbert Lange2009-07-19 15:36:11 +0000
commit5952977ed051330990a64f537a7dfaec68ab6c20 (patch)
treee9864cdc99a44160355ccfe34450aaee35db74e0
parentdbe300fc5303028af56a55efeecd99a0992a7928 (diff)
downloadscummvm-rg350-5952977ed051330990a64f537a7dfaec68ab6c20.tar.gz
scummvm-rg350-5952977ed051330990a64f537a7dfaec68ab6c20.tar.bz2
scummvm-rg350-5952977ed051330990a64f537a7dfaec68ab6c20.zip
use ticks for timing fadeout
svn-id: r42618
-rw-r--r--engines/kyra/sound_amiga.cpp4
-rw-r--r--sound/mods/paula.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp
index 11c28940fd..e858ca3df2 100644
--- a/engines/kyra/sound_amiga.cpp
+++ b/engines/kyra/sound_amiga.cpp
@@ -131,11 +131,11 @@ void SoundAmiga::haltTrack() {
void SoundAmiga::beginFadeOut() {
for (int i = 0x3F; i >= 0; --i) {
_driver->setVolume((byte)i);
- _vm->delay(1000 / 50);
+ _vm->delayWithTicks(1);
}
_driver->stopMusic();
- _vm->delay(1000 / 50);
+ _vm->delayWithTicks(1);
_driver->setVolume(0x40);
}
diff --git a/sound/mods/paula.cpp b/sound/mods/paula.cpp
index f801ecfc9f..e7a916f218 100644
--- a/sound/mods/paula.cpp
+++ b/sound/mods/paula.cpp
@@ -159,7 +159,7 @@ int Paula::readBufferIntern(int16 *buffer, const int numSamples) {
// achieve the same more efficiently: Take rate modulo sLen
// TODO: This messes up dmaCount and shouldnt happen?
if (sLen < rate)
- warning("Paula: lenght %d is lesser than rate", _voice[voice].length);
+ warning("Paula: length %d is lesser than rate", _voice[voice].length);
// rate %= sLen;
// Repeat as long as necessary.