Changeset 45719

Timestamp:

11/07/09 09:40:11 (5 weeks ago)

Author:

megath

Message:

added default delays for the messages

Location:

scummvm/trunk/engines/teenagent

Files:

• scene.cpp (modified) (7 diffs)
• scene.h (modified) (2 diffs)

scummvm/trunk/engines/teenagent/scene.cpp

@@ -300 +300 @@
                 if (!message.empty()) {
                         message.clear();
+                        message_timer = 0;
                         nextEvent();
                         return true;
@@ -310 +311 @@
                                 intro = false;
                                 message.clear();
+                                message_timer = 0;
                                 events.clear();
                                 sounds.clear();
@@ -324 +326 @@
                         if (!message.empty()) {
                                 message.clear();
+                                message_timer = 0;
                                 nextEvent();
                                 return true;
@@ -343 +346 @@
                 restart = false;
                 busy = processEventQueue();
+                if (!message.empty() && message_timer != 0) {
+                        if (--message_timer == 0) {
+                                message.clear();
+                                nextEvent();
+                                continue;
+                        }
+                }
 
                 if (current_event.type == SceneEvent::kCreditsMessage) {
@@ -550 +560 @@
                 case SceneEvent::kMessage: {
                                 message = current_event.message;
+                                message_timer = messageDuration(message);
                                 Common::Point p(
                                         (actor_animation_position.left + actor_animation_position.right) / 2, 
@@ -678 +689 @@
 }
 
+uint Scene::messageDuration(const Common::String &str) {
+        uint words = 1;
+        for(uint i = 0; i < str.size(); ++i) {
+                if (str[i] == ' ' || str[i] == '\n')
+                        ++words;
+        }
+        words *= 7; //add text speed here
+        if (words < 15)
+                words = 15;
+
+        return words;
+}
+
+
 void Scene::displayMessage(const Common::String &str, byte color) {
         //assert(!str.empty());
@@ -684 +709 @@
         message_pos = messagePosition(str, position);
         message_color = color;
+        message_timer = messageDuration(message);
 }
 
 void Scene::clear() {
         message.clear();
+        message_timer = 0;
         events.clear();
         current_event.clear();

scummvm/trunk/engines/teenagent/scene.h

@@ -143 +143 @@
         void setPalette(OSystem *system, const byte *palette, unsigned mul = 1);
         static Common::Point messagePosition(const Common::String &str, Common::Point position);
+        static uint messageDuration(const Common::String &str);
 
         bool processEventQueue();
@@ -171 +172 @@
         Common::Point message_pos;
         byte message_color;
+        uint message_timer;
 
         typedef Common::List<SceneEvent> EventList;