Changeset 7084 for trunk/src/ddraw/OS2SURFACE.CPP

Timestamp:

Oct 17, 2001, 10:08:52 AM (24 years ago)

Author:

sandervl

Message:

colorfill fix

File:

• trunk/src/ddraw/OS2SURFACE.CPP (modified) (7 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.37 2001-10-10 14:40:45 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.38 2001-10-17 08:08:52 sandervl Exp $ */
 
 /*
@@ -2301 +2301 @@
   delete pIRectDest;
 
-  if (NULL!=lpSrcRect)
-  {
+  //src == NULL for colorfill
+  if(src) 
+  {
+   if (NULL!=lpSrcRect)
+   {
 #ifdef RA_HACK
     // Same as for dest rectangle now for src
@@ -2353 +2356 @@
     memcpy(&SrcRect,lpSrcRect,sizeof(RECT) );
 #endif
-  }
-  else
-  {
+   }
+   else
+   {
     pIRectSrc = new DDRectangle( 0, 0, src->width, src->height);
     SrcRect.top    = 0;
@@ -2361 +2364 @@
     SrcRect.bottom = src->height;
     SrcRect.right  = src->width;
-  }
-
-  if(src->fLocked)
-  {
+   }
+  
+   if(src->fLocked)
+   {
     if (NULL==lpSrcRect)
     {
@@ -2395 +2398 @@
       return(DDERR_SURFACEBUSY);
     }
-  }
-  delete pIRectSrc;
+   }
+   delete pIRectSrc;
+  } //if(src)
 
   if(dest->diveBufNr == DIVE_BUFFER_SCREEN &&
@@ -2530 +2534 @@
                   {
                       //TODO: This is not correct for stretching blits
-                      newsrc.left   = SrcRect.left + (newdest.left - DestRect.left);
-                      newsrc.top    = SrcRect.top + (newdest.top - DestRect.top);
-                      newsrc.right  = newsrc.left + RECT_WIDTH(&newdest);
-                      newsrc.bottom = newsrc.top + RECT_HEIGHT(&newdest);
-
+                      if(lpSrcRect) {
+                          newsrc.left   = SrcRect.left + (newdest.left - DestRect.left);
+                          newsrc.top    = SrcRect.top + (newdest.top - DestRect.top);
+                          newsrc.right  = newsrc.left + RECT_WIDTH(&newdest);
+                          newsrc.bottom = newsrc.top + RECT_HEIGHT(&newdest);
+                      }
 //                      DDSURFACEDESC2 surfdesc = {0};
 //                      SurfLock4(dest, &newdest, &surfdesc, 0, 0);
-
-                      ret = SurfDoBlt(This, &newdest, lpDDSrcSurface, &newsrc, dwFlags, lpDDBltFx);
+   
+                      ret = SurfDoBlt(This, &newdest, lpDDSrcSurface, (lpSrcRect) ? &newsrc : NULL, dwFlags, lpDDBltFx);
                       if(ret != DD_OK) {
                           break;
@@ -2560 +2565 @@
   }
 doblit:
-  return SurfDoBlt(This, &DestRect, lpDDSrcSurface, &SrcRect, dwFlags, lpDDBltFx);
+  return SurfDoBlt(This, &DestRect, lpDDSrcSurface, (lpSrcRect) ? &SrcRect : NULL, dwFlags, lpDDBltFx);
 }
 //******************************************************************************