aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2006-05-26 14:21:53 +0000
committerJohannes Schickel2006-05-26 14:21:53 +0000
commitf548f9766667299e327234f661504b13187e89ea (patch)
treec4094debd14ebbae9e1db655cdd6ce0d446d5334 /engines
parent3485102a7e42cebc5e7ed103c2405d741ff3d832 (diff)
downloadscummvm-rg350-f548f9766667299e327234f661504b13187e89ea.tar.gz
scummvm-rg350-f548f9766667299e327234f661504b13187e89ea.tar.bz2
scummvm-rg350-f548f9766667299e327234f661504b13187e89ea.zip
Fixes input handling while moving.
svn-id: r22661
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/kyra.cpp2
-rw-r--r--engines/kyra/scene.cpp6
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index 5895769b90..209b5cb79f 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -652,6 +652,8 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) {
if (update) {
_sprites->updateSceneAnims();
_animator->updateAllObjectShapes();
+ updateTextFade();
+ updateMousePointer();
}
if (_currentCharacter && _currentCharacter->sceneId == 210 && update) {
diff --git a/engines/kyra/scene.cpp b/engines/kyra/scene.cpp
index 0d12a64c5a..2d66874de5 100644
--- a/engines/kyra/scene.cpp
+++ b/engines/kyra/scene.cpp
@@ -993,11 +993,7 @@ int KyraEngine::processSceneChange(int *table, int unk1, int frameReset) {
nextFrame = getTimerDelay(5) * _tickLength + _system->getMillis();
while (_system->getMillis() < nextFrame) {
- _sprites->updateSceneAnims();
- updateMousePointer();
updateGameTimers();
- _animator->updateAllObjectShapes();
- updateTextFade();
if (_currentCharacter->sceneId == 210) {
updateKyragemFading();
if (seq_playEnd() || _beadStateVar == 4 || _beadStateVar == 5) {
@@ -1007,7 +1003,7 @@ int KyraEngine::processSceneChange(int *table, int unk1, int frameReset) {
}
}
if ((nextFrame - _system->getMillis()) >= 10)
- delay(10);
+ delay(10, true);
}
}