aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2007-02-03 19:21:33 +0000
committerJohannes Schickel2007-02-03 19:21:33 +0000
commit3d70157e53e6026e97b99716c3751938c34ac5e5 (patch)
tree3f490a6fa9a87ceffc36fbec5ec41b2e54f75216 /engines/kyra
parentcb49cbdd456a97c6e10bdc279624603bd9bd7b60 (diff)
downloadscummvm-rg350-3d70157e53e6026e97b99716c3751938c34ac5e5.tar.gz
scummvm-rg350-3d70157e53e6026e97b99716c3751938c34ac5e5.tar.bz2
scummvm-rg350-3d70157e53e6026e97b99716c3751938c34ac5e5.zip
Some delay changes. (should fix slow scene animations)
svn-id: r25357
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/kyra.cpp2
-rw-r--r--engines/kyra/text.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index fd8eeba512..8c427b354e 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -678,7 +678,7 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) {
_skipFlag = false;
if (amount > 0 && !_skipFlag && !_quitFlag) {
- _system->delayMillis((amount > 10) ? 10 : amount);
+ _system->delayMillis(10);
}
if (_skipFlag) {
diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp
index cd7332ebd8..4f6ad3674a 100644
--- a/engines/kyra/text.cpp
+++ b/engines/kyra/text.cpp
@@ -113,7 +113,7 @@ void KyraEngine::waitForChatToFinish(int vocFile, int16 chatDuration, const char
if ((chatDuration < (int16)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && (!drawText || !snd_voiceIsPlaying()))
break;
- uint32 nextTime = loopStart + _gameSpeed;
+ uint32 nextTime = loopStart + _tickLength;
while (_system->getMillis() < nextTime) {
while (_system->pollEvent(event)) {