diff options
| author | Vladimir Menshakov | 2009-12-08 22:13:06 +0000 |
|---|---|---|
| committer | Vladimir Menshakov | 2009-12-08 22:13:06 +0000 |
| commit | 4218d3f037da0c050d5b2d99de69c0f1ff29bc3e (patch) | |
| tree | 9f0a51e08582453e5dc386d9365c7587a6c874af /engines/teenagent/scene.cpp | |
| parent | 5b136d2f1a491279f68e08d2b4b1d5de9c89bb97 (diff) | |
| download | scummvm-rg350-4218d3f037da0c050d5b2d99de69c0f1ff29bc3e.tar.gz scummvm-rg350-4218d3f037da0c050d5b2d99de69c0f1ff29bc3e.tar.bz2 scummvm-rg350-4218d3f037da0c050d5b2d99de69c0f1ff29bc3e.zip | |
added message duration override, increased 'the end' timeout
svn-id: r46301
Diffstat (limited to 'engines/teenagent/scene.cpp')
| -rw-r--r-- | engines/teenagent/scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index 3851686a44..93ffd85140 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -812,7 +812,7 @@ bool Scene::processEventQueue() { message_animation = &actor_animation; debug(0, "async message %d-%d (slot %u)", message_first_frame, message_last_frame, current_event.slot); } else { - message_timer = messageDuration(message); + message_timer = current_event.timer? current_event.timer: messageDuration(message); message_first_frame = message_last_frame = 0; } Common::Point p; |