Ticket #8333: bs-rebuild.diff

sword1/animation.cpp

@@ -233 +233 @@
 
 NewGuiColor *AnimationState::lookup = 0;
 
+void AnimationState::invalidateLookup() {
+        // The screen has changed; the lookup table may be obsolete
+        // TODO: Add heuristic to determine if the table really needs to be
+        // rebuilt.
+        free(lookup);
+        lookup = 0;
+        buildLookup();
+}
+
 void AnimationState::buildLookup() {
         if (lookup)
                 return;
@@ -390 +399 @@
 #ifndef BACKEND_8BIT
                         _sys->update_screen();
 #endif
-                        // FIXME: check for ESC and abbort animation be just returning from the function
+                        // FIXME: check for ESC and abort animation be just returning from the function
                         OSystem::Event event;
                         while (_sys->poll_event(&event)) {
-                                if ((event.event_code == OSystem::EVENT_KEYDOWN) &&
-                                    (event.kbd.keycode == 27)) {
-                                        delete anim;
-                                        return;
-                                }
-                                if (event.event_code == OSystem::EVENT_QUIT)
+                                switch (event.event_code) {
+#ifndef BACKEND_8BIT
+                                case OSystem::EVENT_SCREEN_CHANGED:
+                                        anim->invalidateLookup();
+                                        break;
+#endif
+                                case OSystem::EVENT_KEYDOWN:
+                                        if (event.kbd.keycode == 27) {
+                                                delete anim;
+                                                return;
+                                        }
+                                        break;
+                                case OSystem::EVENT_QUIT:
                                         _sys->quit();
+                                        break;
+                                default:
+                                        break;
+                                }
                         }
                 }
         }

sword1/animation.h

@@ -123 +123 @@
         bool init(const char *name);
         bool decodeFrame();
 
+#ifndef BACKEND_8BIT
+        void invalidateLookup(void);
+#endif
+
 private:
 
 #ifdef BACKEND_8BIT

sword2/driver/animation.cpp

@@ -240 +240 @@
 
 NewGuiColor *AnimationState::lookup = 0;
 
+void AnimationState::invalidateLookup() {
+        // TODO: Add heuristic to check if rebuilding the lookup table is
+        // actually necessary. If the screen format remains the same, then the
+        // current lookup table should be fine.
+        free(lookup);
+        lookup = 0;
+        buildLookup();
+}
+
 void AnimationState::buildLookup() {
         if (lookup)
                 return;
@@ -515 +524 @@
         if (i == ARRAYSIZE(_movies))
                 warning("Unknown movie, '%s'", filename);
 
-        while (anim->decodeFrame()) {
+        while (!skipCutscene && anim->decodeFrame()) {
                 if (text && text[textCounter]) {
                         if (frameCounter == text[textCounter]->startFrame) {
                                 openTextObject(text[textCounter]);
@@ -545 +554 @@
                 if (frameCounter == leadOutFrame && musicOut)
                         _vm->_sound->playFx(0, musicOut, 0, 0, RDSE_FXLEADOUT);
 
-#ifdef BACKEND_8BIT
-                _vm->_graphics->updateDisplay(true);
-#else
+#ifndef BACKEND_8BIT
                 anim->updateDisplay();
-                _vm->_graphics->updateDisplay(false);
 #endif
 
-                KeyboardEvent ke;
+                _vm->_system->update_screen();
 
-                if ((_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) || _vm->_quit) {
-                        _vm->_mixer->stopHandle(handle);
-                        skipCutscene = true;
-                        break;
+                OSystem::Event event;
+                while (_vm->_system->poll_event(&event)) {
+                        switch (event.event_code) {
+#ifndef BACKEND_8BIT
+                        case OSystem::EVENT_SCREEN_CHANGED:
+                                anim->invalidateLookup();
+                                break;
+#endif
+                        case OSystem::EVENT_KEYDOWN:
+                                if (event.kbd.keycode == 27)
+                                        skipCutscene = true;
+                                break;
+                        case OSystem::EVENT_QUIT:
+                                _vm->closeGame();
+                                skipCutscene = true;
+                                break;
+                        default:
+                                break;
+                        }
                 }
-
         }
 
         if (!skipCutscene) {
                 // Sleep for one frame so that the last frame is displayed.
                 _vm->_system->delay_msecs(1000 / 12);
-        }
+        } else
+                _vm->_mixer->stopHandle(handle);
 
 #ifndef BACKEND_8BIT
         // Most movies fade to black on their own, but not all of them. Since
@@ -590 +611 @@
 #ifndef BACKEND_8BIT
         anim->updateDisplay();
 #else
-        _vm->_graphics->updateDisplay(true);
+        _vm->_graphics->updateDisplay();
 #endif
 
         // Wait for the voice to stop playing. This is to make sure

sword2/driver/animation.h

@@ -121 +121 @@
         void drawTextObject(SpriteInfo *s, uint8 *src);
         void clearDisplay();
         void updateDisplay(void);
+        void invalidateLookup();
 #endif
 
 private: