Ticket #8031: patch_screeneffects4.diff

backends/dc/dc.h

@@ -15 +15 @@
   // Draw a bitmap to screen.
   // The screen will not be updated to reflect the new bitmap
   void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+  void move_screen(int dx, int dy, int height);
 
   // Update the dirty areas of the screen
   void update_screen();

backends/dc/display.cpp

@@ -132 +132 @@
   } while (--h);
 }
 
+void OSystem_Dreamcast::move_screen(int dx, int dy, int height) {
+
+        if ((dx == 0) && (dy == 0))
+                return;
+
+        if (dx == 0) {
+                // vertical movement
+                if (dy > 0) {
+                        // move down
+                        // copy from bottom to top
+                        for (int y = height - 1; y >= dy; y--)
+                                copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, SCREEN_W, 1);
+                } else {
+                        // move up
+                        // copy from top to bottom
+                        for (int y = 0; y < height + dx; y++)
+                                copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, SCREEN_W, 1);
+                }
+        } else if (dy == 0) {
+                // horizontal movement
+                if (dx > 0) {
+                        // move right
+                        // copy from right to left
+                        for (int x = SCREEN_W - 1; x >= dx; x--)
+                                copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+                } else {
+                        // move left
+                        // copy from left to right
+                        for (int x = 0; x < SCREEN_W; x++)
+                                copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+                }
+        } else {
+                // free movement
+                // not neccessary for now
+        }
+
+
+}
+
+
 bool OSystem_Dreamcast::show_mouse(bool visible)
 {       
   bool last = _ms_visible;

backends/mac/mac.cpp

@@ -772 +772 @@
         } while(--h);
 }
 
+void OSystem_MAC::move_screen(int dx, int dy) {
+
+
+}
+
+
 void OSystem_MAC::add_dirty_rect(int x, int y, int w, int h) {
         if (force_full)
                 return;

backends/morphos/morphos.cpp

@@ -926 +926 @@
         }
 }
 
+void OSystem_MorphOS::move_screen(int dx, int dy, int height) {
+
+        if ((dx == 0) && (dy == 0))
+                return;
+
+        if (dx == 0) {
+                // vertical movement
+                if (dy > 0) {
+                        // move down
+                        // copy from bottom to top
+                        for (int y = height - 1; y >= dy; y--)
+                                copy_rect((byte *)ScummBuffer + ScummBufferWidth * (y - dy), ScummBufferWidth, 0, y, ScummBufferWidth, 1);
+                } else {
+                        // move up
+                        // copy from top to bottom
+                        for (int y = 0; y < height + dx; y++)
+                                copy_rect((byte *)ScummBuffer + ScummBufferWidth * (y - dy), ScummBufferWidth, 0, y, ScummBufferWidth, 1);
+                }
+        } else if (dy == 0) {
+                // horizontal movement
+                if (dx > 0) {
+                        // move right
+                        // copy from right to left
+                        for (int x = ScummBufferWidth - 1; x >= dx; x--)
+                                copy_rect((byte *)ScummBuffer + x - dx, ScummBufferWidth, x, 0, 1, height);
+                } else {
+                        // move left
+                        // copy from left to right
+                        for (int x = 0; x < ScummBufferWidth; x++)
+                                copy_rect((byte *)ScummBuffer + x - dx, ScummBufferWidth, x, 0, 1, height);
+                }
+        } else {
+                // free movement
+                // not neccessary for now
+        }
+
+
+}
+
+
 bool OSystem_MorphOS::AddUpdateRect(WORD x, WORD y, WORD w, WORD h)
 {
         if (x < 0) { w+=x; x = 0; }

backends/morphos/morphos.h

@@ -47 +47 @@
                 // Draw a bitmap to screen.
                 // The screen will not be updated to reflect the new bitmap
                 virtual void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+                void move_screen(int dx, int dy, int height);
 
                 // Update the dirty areas of the screen
                 virtual void update_screen();

backends/null/null.cpp

@@ -30 +30 @@
         void set_palette(const byte *colors, uint start, uint num) {}
         void init_size(uint w, uint h);
         void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) {}
+        void move_screen(int dx, int dy) {}
         void update_screen() {}
         bool show_mouse(bool visible) { return false; }
         void set_mouse_pos(int x, int y) {}

backends/sdl/sdl-common.cpp

@@ -135 +135 @@
 }
 
 
+void OSystem_SDL_Common::move_screen(int dx, int dy, int height) {
+
+        if ((dx == 0) && (dy == 0))
+                return;
+
+        if (dx == 0) {
+                // vertical movement
+                if (dy > 0) {
+                        // move down
+                        // copy from bottom to top
+                        for (int y = height - 1; y >= dy; y--)
+                                copy_rect((byte *)sdl_screen->pixels + SCREEN_WIDTH * (y - dy), SCREEN_WIDTH, 0, y, SCREEN_WIDTH, 1);
+                } else {
+                        // move up
+                        // copy from top to bottom
+                        for (int y = 0; y < height + dx; y++)
+                                copy_rect((byte *)sdl_screen->pixels + SCREEN_WIDTH * (y - dy), SCREEN_WIDTH, 0, y, SCREEN_WIDTH, 1);
+                }
+        } else if (dy == 0) {
+                // horizontal movement
+                if (dx > 0) {
+                        // move right
+                        // copy from right to left
+                        for (int x = SCREEN_WIDTH - 1; x >= dx; x--)
+                                copy_rect((byte *)sdl_screen->pixels + x - dx, SCREEN_WIDTH, x, 0, 1, height);
+                } else {
+                        // move left
+                        // copy from left to right
+                        for (int x = 0; x < SCREEN_WIDTH; x++)
+                                copy_rect((byte *)sdl_screen->pixels + x - dx, SCREEN_WIDTH, x, 0, 1, height);
+                }
+        } else {
+                // free movement
+                // not neccessary for now
+        }
+}
+
 void OSystem_SDL_Common::add_dirty_rect(int x, int y, int w, int h) {
         if (force_full)
                 return;

backends/sdl/sdl-common.h

@@ -42 +42 @@
         // The screen will not be updated to reflect the new bitmap
         void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
 
+        void move_screen(int dx, int dy, int height);
+
         // Update the dirty areas of the screen
         void update_screen() = 0;
 

backends/wince/pocketpc.cpp

@@ -95 +95 @@
         // The screen will not be updated to reflect the new bitmap
         void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
 
+        void move_screen(int dx, int dy, int height);
+
         // Update the dirty areas of the screen
         void update_screen();
 
@@ -1215 +1217 @@
         } while (--h);
 }
 
+void OSystem_WINCE3::move_screen(int dx, int dy, int height) {
+
+        if ((dx == 0) && (dy == 0))
+                return;
+
+        if (dx == 0) {
+                // vertical movement
+                if (dy > 0) {
+                        // move down
+                        // copy from bottom to top
+                        for (int y = height - 1; y >= dy; y--)
+                                copy_rect(_gfx_buf + SCREEN_WIDTH * (y - dy), SCREEN_WIDTH, 0, y, SCREEN_WIDTH, 1);
+                } else {
+                        // move up
+                        // copy from top to bottom
+                        for (int y = 0; y < height + dx; y++)
+                                copy_rect(_gfx_buf + SCREEN_WIDTH * (y - dy), SCREEN_WIDTH, 0, y, SCREEN_WIDTH, 1);
+                }
+        } else if (dy == 0) {
+                // horizontal movement
+                if (dx > 0) {
+                        // move right
+                        // copy from right to left
+                        for (int x = SCREEN_WIDTH - 1; x >= dx; x--)
+                                copy_rect(_gfx_buf + x - dx, SCREEN_WIDTH, x, 0, 1, height);
+                } else {
+                        // move left
+                        // copy from left to right
+                        for (int x = 0; x < SCREEN_WIDTH; x++)
+                                copy_rect(_gfx_buf + x - dx, SCREEN_WIDTH, x, 0, 1, height);
+                }
+        } else {
+                // free movement
+                // not neccessary for now
+        }
+
+
+}
+
+
 void OSystem_WINCE3::update_screen() {
 
         if (!hide_cursor)

backends/x11/x11.cpp

@@ -62 +62 @@
         // The screen will not be updated to reflect the new bitmap
         void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
 
+        void move_screen(int dx, int dy, int height);
+
         // Update the dirty areas of the screen
         void update_screen();
 
@@ -508 +510 @@
                 buf += pitch;
         }
 }
+
+void OSystem_X11::move_screen(int dx, int dy, int height) {
+
+        if ((dx == 0) && (dy == 0))
+                return;
+
+        if (dx == 0) {
+                // vertical movement
+                if (dy > 0) {
+                        // move down
+                        // copy from bottom to top
+                        for (int y = height - 1; y >= dy; y--)
+                                copy_rect(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
+                } else {
+                        // move up
+                        // copy from top to bottom
+                        for (int y = 0; y < height + dx; y++)
+                                copy_rect(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
+                }
+        } else if (dy == 0) {
+                // horizontal movement
+                if (dx > 0) {
+                        // move right
+                        // copy from right to left
+                        for (int x = fb_width - 1; x >= dx; x--)
+                                copy_rect(local_fb + x - dx, fb_width, x, 0, 1, height);
+                } else {
+                        // move left
+                        // copy from left to right
+                        for (int x = 0; x < fb_width; x++)
+                                copy_rect(local_fb + x - dx, fb_width, x, 0, 1, height);
+                }
+        } else {
+                // free movement
+                // not neccessary for now
+        }
+}
+
 
 void OSystem_X11::update_screen_helper(const dirty_square * d, dirty_square * dout)
 {

common/system.h

@@ -90 +90 @@
         // The screen will not be updated to reflect the new bitmap
         virtual void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) = 0;
 
+        // Moves the screen content around by the given amount of pixels
+        // but only the top height pixel rows, the rest stays untouched
+        virtual void move_screen(int dx, int dy, int height) = 0;
+
         // Update the dirty areas of the screen
         virtual void update_screen() = 0;
 

scumm/gfx.cpp

@@ -677 +677 @@
                 dissolveEffect(8, 8);
                 break;
         case 130:
-                unkScreenEffect1();
+                scrollEffect(3); // right   unkScreenEffect1();
                 break;
         case 131:
-                unkScreenEffect2();
+                scrollEffect(2); // left     unkScreenEffect2();
                 break;
         case 132:
-                unkScreenEffect3();
+                scrollEffect(1);  // down    unkScreenEffect3();
                 break;
         case 133:
-                unkScreenEffect4();
+                scrollEffect(0);  // up   unkScreenEffect4();
                 break;
         case 134:
                 dissolveEffect(1, 1);
@@ -2087 +2087 @@
                 waitForTimer(30);
         }
 }
+
+void Scumm::scrollEffect(int dir) {
+
+        VirtScreen *vs = &virtscr[0];
+
+        int x, y;
+        int step;
+
+        if ((dir == 0) || (dir == 1))
+                step = vs->height;
+        else
+                step = vs->width;
+
+#define scrolltime 500  // ms the scroll is supposed to take
+#define picturedelay 20
+
+        step /= (scrolltime/picturedelay);
+
+        switch (dir) {
+        case 0:
+                //up
+                y = 1 + step;
+                while (y < vs->height) {
+                        _system->move_screen(0, -step, vs->height);
+                        _system->copy_rect(vs->screenPtr + vs->xstart + (y - step) * vs->width,
+                                vs->width,
+                                0, vs->height - step,
+                                vs->width, step);
+                        _system->update_screen();
+                        waitForTimer(picturedelay);
+
+                        y += step;
+                }
+                break;
+        case 1:
+                // down
+                y = 1 + step;
+                while (y < vs->height) {
+                        _system->move_screen(0, step, vs->height);
+                        _system->copy_rect(vs->screenPtr + vs->xstart + vs->width * (vs->height-y),
+                                vs->width,
+                                0, 0,
+                                vs->width, step);
+                        _system->update_screen();
+                        waitForTimer(picturedelay);
+
+                        y += step;
+                }
+                break;
+        case 2:
+                // left
+                x = 1 + step;
+                while (x < vs->width) {
+                        _system->move_screen(-step, 0, vs->height);
+                        _system->copy_rect(vs->screenPtr + vs->xstart + x - step,
+                                vs->width,
+                                vs->width - step, 0,
+                                step, vs->height);
+                        _system->update_screen();
+                        waitForTimer(picturedelay);
+
+                        x += step;
+                }
+                break;
+        case 3:
+                // right
+                x = 1 + step;
+                while (x < vs->width) {
+                        _system->move_screen(step, 0, vs->height);
+                        _system->copy_rect(vs->screenPtr + vs->xstart + vs->width - x,
+                                vs->width,
+                                0, 0,
+                                step, vs->height);
+                        _system->update_screen();
+                        waitForTimer(picturedelay);
+
+                        x += step;
+                }
+                break;
+        }
+}
+
 
 void Scumm::unkScreenEffect5(int a) {
         // unkScreenEffect5(0), which is used by FOA during the opening

scumm/scumm.h

@@ -837 +837 @@
         void unkScreenEffect5(int a);
         void transitionEffect(int a);           // former unkScreenEffect7
         void dissolveEffect(int width, int height);     // former unkScreenEffect5(0) and unkScreenEffect6
+        void scrollEffect(int dir);     // former unkScreenEffects 1-4
 
         void decompressBomp(byte *dst, byte *src, int w, int h);
         uint _shakeFrame;