Ticket #8079: codec5-cleanup.diff

scummvm/scumm/akos.cpp

@@ -859 +859 @@
 
 void AkosRenderer::codec5()
 {
-        VirtScreen *vs;
-
         int left, right, top, bottom;
-        int clip_left, clip_right, clip_top, clip_bottom;
+        int clip_top, clip_bottom;
+        int screen_width = (int) outwidth;
+        int screen_height = (int) outheight;
 
         byte *src, *dest;
         int src_x, src_y;
@@ -880 +880 @@
         // What I do know is that drawBomp() doesn't care about masking and
         // shadows, and these are both needed for Full Throttle and The Dig.
         
-        vs = &_vm->virtscr[0];
-
         if (!mirror) {
                 left = (x - move_x_cur - width) + 1;
         } else {
@@ -892 +890 @@
         top = y + move_y_cur;
         bottom = top + height;
 
-        if (left >= _vm->_realWidth || top >= _vm->_realHeight)
+        if (left >= screen_width || top >= screen_height)
                 return;
 
+        _vm->updateDirtyRect(0, left, right, top, bottom, 1 << dirty_id);
+
         // The actual drawing code shouldn't survive even if the image is
-        // partially outside the screen, but something before that seems to
-        // be less tolerant...
+        // partially outside the screen, but I used to have trouble with
+        // crashes here so other functions may be less tolerant...
 
-        clip_left = (left >= 0) ? left : 0;
-        clip_right = (right > _vm->_realWidth) ? _vm->_realWidth : right;
         clip_top = (top >= 0) ? top : 0;
-        clip_bottom = (bottom > _vm->_realHeight) ? _vm->_realHeight : bottom;
-        
+        clip_bottom = (bottom > screen_height) ? screen_height : bottom;
+
         if (clip_top < draw_top)
                 draw_top = clip_top;
         if (clip_bottom > draw_bottom)
                 draw_bottom = clip_bottom;
 
-        _vm->updateDirtyRect(0, clip_left, clip_right, clip_top, clip_bottom, 1 << dirty_id);
-
         masking = false;
         if (clipping) {
-                masking = _vm->isMaskActiveAt(clip_left, clip_top, clip_right, clip_bottom,
+                masking = _vm->isMaskActiveAt(left, top, right, clip_bottom,
                         _vm->getResourceAddress(rtBuffer, 9) +
                         _vm->gdi._imgBufOffs[clipping] +
                         _vm->_screenStartStrip) != 0;
@@ -936 +932 @@
         for (src_y = 0, dst_y = top; src_y < height; src_y++) {
                 byte code, color;
                 uint num, i;
-                byte *d = dest + dst_y * _vm->_realWidth + left;
+                byte *d = dest + dst_y * screen_width + left;
                 byte *s;
                 uint data_length;
 
                 data_length = READ_LE_UINT16(src) + 2;
 
-                if (dst_y < 0 || dst_y >= _vm->_realHeight) {
+                if (dst_y < 0 || dst_y >= screen_height) {
                         src += data_length;
                         dst_y++;
                         continue;
@@ -958 +954 @@
                         if (code & 1) {
                                 color = *s++;
                                 for (i = 0; i < num; i++) {
-                                        if (dst_x >= 0 && dst_x < _vm->_realWidth) {
+                                        if (dst_x >= 0 && dst_x < screen_width) {
                                                 if (color != 255) {
                                                         if (v1.mask_ptr)
                                                                 mask = v1.mask_ptr + 40 * dst_y + (dst_x >> 3);
@@ -976 +972 @@
                         } else {
                                 for (i = 0; i < num; i++) {
                                         color = s[i];
-                                        if (dst_x >= 0 && dst_x < _vm->_realWidth) {
+                                        if (dst_x >= 0 && dst_x < screen_width) {
                                                 if (color != 255) {
                                                         if (v1.mask_ptr)
                                                                 mask = v1.mask_ptr + 40 * dst_y + (dst_x >> 3);