Ticket #7927: scummvm-shake2.patch

gfx.cpp

@@ -1409 +1409 @@
 }
 
 void Scumm::setShake(int mode) {
-        if (mode!=-1)
+        if (mode < 0)
+                _shakeMode = 0;
+        else 
                 _shakeMode = mode;
-        else
-                mode = 0;
-        /* XXX: not implemented */
-        warning("stub setShake(%d)",mode);
+
+        if (_shakeMode) _shakeFrame = 0;
+
+        updateScreen(this);
+
+        warning("stub setShake(%d) - half implemented",mode);
 }
 
 void Gdi::clearUpperMask() {

scumm.h

@@ -1034 +1034 @@
                 
         int16 _talkDelay;
         int16 _shakeMode;
+        int16 _shakeFrame;
+        uint32 _shakeTicks;
 
         int16 _virtual_mouse_x, _virtual_mouse_y;
 

sdl.cpp

@@ -29 +29 @@
 #include "SDL_thread.h"
 
 #define SCALEUP_2x2
+#define MIN_SHAKE_MS 150
 
 Scumm scumm;
 ScummDebugger debugger;
@@ -38 +39 @@
 SOUND_DRIVER_TYPE snd_driv;
 
 static SDL_Surface *screen;
+static SDL_Surface *shakebuf;
+static SDL_Surface *blackness;
 
 void updateScreen(Scumm *s);
 
@@ -56 +59 @@
                 colors[i].unused = 0;
         }
         
+        SDL_SetColors(shakebuf, colors, first, num);
         SDL_SetColors(screen, colors, first, num);
         
         s->_palDirtyMax = -1;
@@ -202 +206 @@
 void blitToScreen(Scumm *s, byte *src,int x, int y, int w, int h) {
         byte *dst;
         int i;
+        SDL_Surface *target;
 
         hide_mouse = true;
         if (has_mouse) {
                 s->drawMouse();
         }
 
-        if (SDL_LockSurface(screen)==-1)
+        if (s->_shakeMode || s->_shakeFrame) {
+                target = shakebuf;
+        } else {
+                target = screen;
+        }
+
+        if (SDL_LockSurface(target)==-1)
                 error("SDL_LockSurface failed: %s.\n", SDL_GetError());
 
 #if !defined(SCALEUP_2x2)
-        dst = (byte*)screen->pixels + y*320 + x;
-        addDirtyRect(x,y,w,h);
+        dst = (byte*)target->pixels + y*320 + x;
+                if (s->_shakeMode)
+                        addDirtyRectClipped(x, y-4, w, h+8);
+                else
+                        addDirtyRect(x,y,w,h);
         do {
                 memcpy(dst, src, w);
                 dst += 320;
                 src += 320;
         } while (--h);
 #else
-        dst = (byte*)screen->pixels + y*640*2 + x*2;
-        addDirtyRect(x,y,w,h);          
+        dst = (byte*)target->pixels + y*640*2 + x*2;
+        if (s->_shakeMode)
+                addDirtyRectClipped(x, y-4, w, h+8);
+        else
+                addDirtyRect(x,y,w,h);
         do {
                 i=0;
                 do {
@@ -234 +251 @@
 
 #endif
 
-        SDL_UnlockSurface(screen);
+        SDL_UnlockSurface(target);
 }
 
 void updateScreen(Scumm *s) {
+        SDL_Rect srcr, destr;
 
         if (s->_fastMode&2)
                 return;
@@ -247 +265 @@
                 s->drawMouse();
         }
         
+        if (s->_shakeMode) {
+                /* if a shake has just begun, we take a copy of the screen */
+                if (s->_shakeFrame == 0) {
+                        if (SDL_BlitSurface(screen, NULL, shakebuf, NULL))
+                                error("SDL_BlitSurface failed: %s.\n", SDL_GetError());
+                }
+
+
+
+                destr.x = 0; destr.y = 0;
+                destr.w = shakebuf->w; 
+                srcr.x = 0; srcr.y = 0;
+                srcr.w = screen->w; 
+
+#if defined(SCALEUP_2x2)
+                destr.h = shakebuf->h-4;
+                srcr.h = screen->h-4;
+#else
+                destr.h = shakebuf->h-2;
+                srcr.h = screen->h-2;
+#endif
+
+                /* compensate for the fact that this will be called much more 
+                 * during mouse movement */
+                if (((SDL_GetTicks()) >= s->_shakeTicks + MIN_SHAKE_MS) || 
+                                (s->_shakeFrame == 0)) {
+                        s->_shakeFrame++;
+                        s->_shakeTicks = SDL_GetTicks();
+                        fullRedraw = true;
+                }
+                if (s->_shakeFrame % 2) {
+#if defined(SCALEUP_2x2)
+                        srcr.y += 4;
+#else
+                        srcr.y += 2;
+#endif
+
+                } else {
+#if defined(SCALEUP_2x2)
+                        destr.y += 4;
+#else
+                        destr.y += 2;
+#endif
+                }
+
+
+                if (SDL_BlitSurface(shakebuf, &srcr, screen, &destr))
+                        error("SDL_BlitSurface failed: %s.\n", SDL_GetError());
+
+
+#if defined(SCALEUP_2x2)
+                destr.h = 4;
+                if (s->_shakeFrame % 2) 
+                        destr.y = screen->h-4; 
+                else
+                        destr.y = 0;
+#else
+                destr.h = 2;
+                if (s->_shakeFrame % 2) 
+                        destr.y = screen->h-2; 
+                else
+                        destr.y = 0;
+#endif
+                if (SDL_BlitSurface(blackness, NULL, screen, &destr))
+                        error("SDL_BlitSurface failed: %s.\n", SDL_GetError());
+
+        } else if (s->_shakeFrame) {
+                /* shake has just ended, clean up */
+                fullRedraw = true;
+                if (SDL_BlitSurface(shakebuf, NULL, screen, NULL))
+                        error("SDL_BlitSurface failed: %s.\n", SDL_GetError());
+                s->_shakeFrame = 0;
+        }
+
         if(s->_palDirtyMax != -1) {
                 updatePalette(s);
         }
+
         if (fullRedraw) {
                 SDL_UpdateRect(screen, 0,0,0,0);
+                fullRedraw = false;
 #if defined(SHOW_AREA)
                 debug(2,"update area 100 %%");
 #endif
@@ -273 +367 @@
         int x,y;
         byte *dst,*bak;
         byte color;
+        SDL_Surface *target;
 
         if (hide_mouse)
                 visible = false;
 
-        if (SDL_LockSurface(screen)==-1)
+        if (s->_shakeMode || s->_shakeFrame) {
+                target = shakebuf;
+        } else {
+                target = screen;
+        }
+
+        if (SDL_LockSurface(target)==-1)
                 error("SDL_LockSurface failed: %s.\n", SDL_GetError());
 
 #if defined(SCALEUP_2x2)
 
         if (has_mouse) {
-                dst = (byte*)screen->pixels + old_mouse_y*640*2 + old_mouse_x*2;
+                dst = (byte*)target->pixels + old_mouse_y*640*2 + old_mouse_x*2;
                 bak = old_backup;
 
                 for (y=0; y<old_mouse_h; y++,bak+=BAK_WIDTH*2,dst+=640*2) {
@@ -299 +400 @@
         }
 
         if (visible) {
-                dst = (byte*)screen->pixels + ydraw*640*2 + xdraw*2;
+                dst = (byte*)target->pixels + ydraw*640*2 + xdraw*2;
                 bak = old_backup;
 
                 for (y=0; y<h; y++,dst+=640*2,bak+=BAK_WIDTH*2,buf+=w) {
@@ -321 +422 @@
         }
 #else
         if (has_mouse) {
-                dst = (byte*)screen->pixels + old_mouse_y*320 + old_mouse_x;
+                dst = (byte*)target->pixels + old_mouse_y*320 + old_mouse_x;
                 bak = old_backup;
 
                 for (y=0; y<old_mouse_h; y++,bak+=BAK_WIDTH,dst+=320) {
@@ -335 +436 @@
                 }
         }
         if (visible) {
-                dst = (byte*)screen->pixels + ydraw*320 + xdraw;
+                dst = (byte*)target->pixels + ydraw*320 + xdraw;
                 bak = old_backup;
 
                 for (y=0; y<h; y++,dst+=320,bak+=BAK_WIDTH,buf+=w) {
@@ -355 +456 @@
 
 #endif  
 
-        SDL_UnlockSurface(screen);
+        SDL_UnlockSurface(target);
 
         if (has_mouse) {
                 has_mouse = false;
-                addDirtyRectClipped(old_mouse_x, old_mouse_y, old_mouse_w, old_mouse_h);
+                if (s->_shakeMode)
+                        addDirtyRectClipped(old_mouse_x, old_mouse_y-4, old_mouse_w, old_mouse_h+8);
+                else
+                        addDirtyRectClipped(old_mouse_x, old_mouse_y, old_mouse_w, old_mouse_h);
         }
 
         if (visible) {
                 has_mouse = true;
-                addDirtyRectClipped(xdraw, ydraw, w, h);
+                if (s->_shakeMode)
+                        addDirtyRectClipped(xdraw, ydraw-4, w, h+8);
+                else
+                        addDirtyRectClipped(xdraw, ydraw, w, h);
                 old_mouse_x = xdraw;
                 old_mouse_y = ydraw;
                 old_mouse_w = w;
@@ -430 +537 @@
         }
 
 #if !defined(SCALEUP_2x2)
-        screen = SDL_SetVideoMode(320, 200, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : SDL_SWSURFACE);
+        if (!(screen = SDL_SetVideoMode(320, 200, 8, 
+                        fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : SDL_SWSURFACE)))
+#else
+        if (!(screen = SDL_SetVideoMode(640, 400, 8, 
+                        fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : SDL_SWSURFACE)))
+#endif
+                error("SDL_SetVideoMode failed: %s.\n", SDL_GetError());
+
+        if (!(shakebuf = SDL_CreateRGBSurface(SDL_SWSURFACE, screen->w, 
+                                        screen->h, 8, 0, 0, 0, 0)))
+                error("SDL_CreateRGBSurface failed: %s.\n", SDL_GetError());
+
+#if !defined(SCALEUP_2x2)
+        if (!(blackness = SDL_CreateRGBSurface(SDL_SWSURFACE, screen->w, 2, 
+                                        8, 0, 0, 0, 0)))
 #else
-        screen = SDL_SetVideoMode(640, 400, 8, fullScreen ? (SDL_SWSURFACE | SDL_FULLSCREEN) : SDL_SWSURFACE);
+        if (!(blackness = SDL_CreateRGBSurface(SDL_SWSURFACE, screen->w, 4, 
+                                        8, 0, 0, 0, 0)))
 #endif
+                error("SDL_CreateRGBSurface failed: %s.\n", SDL_GetError());
+
+        if(SDL_FillRect(blackness, NULL, 0))
+                error("SDL_FillRect failed: %s.\n", SDL_GetError());
 
         printf("%d %d, %d %d, %d %d %d, %d %d %d %d %d\n", 
                 sizeof(int8), sizeof(uint8),