Changeset 45575

Timestamp:

10/31/09 18:49:47 (2 months ago)

Author:

megath

Message:

added cutscenes where needed, fixed invalid skipping of fullscreen messages.

Location:

scummvm/trunk/engines/teenagent

Files:

• callbacks.cpp (modified) (4 diffs)
• font.cpp (modified) (2 diffs)
• scene.cpp (modified) (4 diffs)
• scene.h (modified) (1 diff)
• teenagent.cpp (modified) (2 diffs)
• teenagent.h (modified) (1 diff)

scummvm/trunk/engines/teenagent/callbacks.cpp

@@ -2097 +2097 @@
                         setOns(1, 0x66);
                         moveTo(224, 194, 0, true);
-                        debug(0, "FIXME: add cut message: 57DF at 30423");
+                        displayCutsceneMessage(0x57df, 30423);
                         inventory->remove(0x59);
                 } else {
@@ -3624 +3624 @@
                                 playSound(26, 30 + i * 11);
                         playActorAnimation(661);
-                        //cutscene 3c80 at 30484
+                        displayCutsceneMessage(0x3c80, 30484);
                         playSound(56, 10);
                         playSound(56, 21);
@@ -3638 +3638 @@
                         setOns(1, 49);
 
-                        //cutscene 0x3c9a at 30453
+                        displayCutsceneMessage(0x3c9a, 30453);
                         moveTo(162, 184, 0, true);
                         playSound(26, 6);
@@ -3709 +3709 @@
 
                 playMusic(11);
-                debug(0, "FIXME: cutscene: meanwhile in a mansion #%u, %04x", tries, ptr);
+                displayCutsceneMessage(0x580a, 30484);
                 processCallback(ptr);
                 playMusic(6);

scummvm/trunk/engines/teenagent/font.cpp

@@ -64 +64 @@
                         byte v = *glyph++;
                         switch (v) {
+                        case 0:
+                                break;
                         case 1:
                                 dst[j] = shadow_color;
@@ -70 +72 @@
                                 dst[j] = color;
                                 break;
+                        default:
+                                dst[j] = v;
                         }
                 }

scummvm/trunk/engines/teenagent/scene.cpp

@@ -317 +317 @@
                         current_event.clear();
                         message_color = 0xd1;
+                        Resources::instance()->font7.color = 0xd1;
                         for (int i = 0; i < 4; ++i)
                                 custom_animation[i].free();
@@ -322 +323 @@
                         init(10, Common::Point(136, 153));
                 }
-                return false;
+                return true;
 
         default:
@@ -332 +333 @@
         //render background
         Resources *res = Resources::instance();
-        if (current_event.type == SceneEvent::kCreditsMessage) {
-                system->fillScreen(0);
-                Graphics::Surface *surface = system->lockScreen();
-                res->font8.color = current_event.color;
-                res->font8.shadow_color = current_event.orientation;
-                res->font8.render(surface, current_event.dst.x, current_event.dst.y, message);
-                system->unlockScreen();
-                return true;
-        }
-
         bool busy;
         bool restart;
@@ -348 +339 @@
                 restart = false;
                 busy = processEventQueue();
+
+                if (current_event.type == SceneEvent::kCreditsMessage) {
+                        system->fillScreen(0);
+                        Graphics::Surface *surface = system->lockScreen();
+                        if (current_event.lan == 8) {
+                                res->font8.color = current_event.color;
+                                res->font8.shadow_color = current_event.orientation;
+                                res->font8.render(surface, current_event.dst.x, current_event.dst.y, message);
+                        } else {
+                                res->font7.color = 0xd1;
+                                res->font7.render(surface, current_event.dst.x, current_event.dst.y, message);
+                        } 
+                        system->unlockScreen();
+                        return true;
+                }
+
                 system->copyRectToScreen((const byte *)background.pixels, background.pitch, 0, 0, background.w, background.h);
 

scummvm/trunk/engines/teenagent/scene.h

@@ -39 +39 @@
 struct SceneEvent {
         enum Type {
-                kNone,
+                kNone,                                  //0
                 kMessage,
                 kWalk,
                 kPlayAnimation,
-                kPlayActorAnimation,
+                kPlayActorAnimation,    //4
                 kPauseAnimation,
                 kClearAnimations,
                 kLoadScene,
-                kSetOn,
+                kSetOn,                                 //8
                 kSetLan,
                 kPlayMusic,
                 kPlaySound,
-                kEnableObject,
+                kEnableObject,                  //12
                 kHideActor,
                 kWaitForAnimation,
                 kCreditsMessage,
-                kQuit
+                kQuit                                   //16
         } type;
 

scummvm/trunk/engines/teenagent/teenagent.cpp

@@ -378 +378 @@
         event.orientation = *src++;
         event.color = *src++;
+        event.lan = 8;
 
         event.dst.y = *src;
@@ -394 +395 @@
 }
 
+void TeenAgentEngine::displayCutsceneMessage(uint16 addr, uint16 position) {
+        SceneEvent event(SceneEvent::kCreditsMessage);
+
+        event.message = parseMessage(addr);
+        event.dst.x = position % 320;
+        event.dst.y = position / 320;
+        event.lan = 7;
+        
+        scene->push(event);
+}
+
+
 void TeenAgentEngine::moveTo(const Common::Point &dst, byte o, bool warp) {
         moveTo(dst.x, dst.y, o, warp);

scummvm/trunk/engines/teenagent/teenagent.h

@@ -69 +69 @@
         void displayMessage(const Common::String &str, byte color = 0xd1);
         void displayCredits(uint16 addr);
+        void displayCutsceneMessage(uint16 addr, uint16 position);
         void moveTo(const Common::Point &dst, byte o, bool warp = false);
         void moveTo(uint16 x, uint16 y, byte o, bool warp = false);