diff Render.cpp @ 2421:fc7456da5a93

Слияние
author Ritor1
date Wed, 23 Jul 2014 01:14:21 +0600
parents 0313c761d203 df09713d6531
children bb1273b1b9b6
line wrap: on
line diff
--- a/Render.cpp	Wed Jul 23 01:12:55 2014 +0600
+++ b/Render.cpp	Wed Jul 23 01:14:21 2014 +0600
@@ -802,7 +802,8 @@
       {
         delete [] v20.pDriverName;
         delete [] v20.pDeviceDesc;
-        delete [] v20.pDDraw4DevDesc;
+        //free(v20.pDDraw4DevDesc);
+		delete [] v20.pDDraw4DevDesc;
         delete v20.pGUID;
         v6 = (IUnknown *)pDirectDraw4;
       }
@@ -813,7 +814,8 @@
         pDirect3D3->EnumDevices((LPD3DENUMDEVICESCALLBACK)D3DDeviceEnumerator, &aux);
         delete [] v20.pDriverName;
         delete [] v20.pDeviceDesc;
-        delete [] v20.pDDraw4DevDesc;
+        //free(v20.pDDraw4DevDesc);
+		delete [] v20.pDDraw4DevDesc;
         delete v20.pGUID;
         pDirectDraw4->Release();
         v6 = (IUnknown *)pDirect3D3;
@@ -1879,7 +1881,7 @@
     Point.x = 0;
     ClientToScreen(hWindow, &Point);
     OffsetRect(&rc, Point.x, Point.y);
-    pFrontBuffer->Blt(&rc, pBackBuffer, &v5, DDBLT_WAIT, 0);//Uninitialized memory access
+    pFrontBuffer->Blt(&rc, pBackBuffer, &v5, DDBLT_WAIT, 0);
   }
   else
     pFrontBuffer->Flip(0, 1);
@@ -2757,7 +2759,7 @@
         for ( test_byte = 1; test_byte < 63; ++test_byte )
         {
           v15 = i + test_byte;
-          if ( lineRGB[v15] != pict_byte )//Uninitialized memory access
+          if ( lineRGB[v15] != pict_byte )
             break;
           if ( !(v15 % pitch) )
             break;
@@ -6393,7 +6395,7 @@
     }
     delete [] sprite_texture->pPixels;
     delete sprite_texture;
-    return true;
+	return true;
   }
   return false;
 }