From 4218d3f037da0c050d5b2d99de69c0f1ff29bc3e Mon Sep 17 00:00:00 2001
From: Vladimir Menshakov
Date: Tue, 8 Dec 2009 22:13:06 +0000
Subject: added message duration override, increased 'the end' timeout

svn-id: r46301
---
 engines/teenagent/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/teenagent/scene.cpp')

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;
-- 
cgit v1.2.3