diff UI/UIPopup.cpp @ 2475:acac52e9e36a

remove DirectX11.cpp/.h for VS2010, MatrixMultiply and other
author Ritor1
date Thu, 21 Aug 2014 11:24:51 +0600
parents 104fdbea0386
children 5abd8fc8f1c6
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Tue Aug 19 23:25:45 2014 +0100
+++ b/UI/UIPopup.cpp	Thu Aug 21 11:24:51 2014 +0600
@@ -445,7 +445,7 @@
   PlayerSpeech speech; // [sp-8h] [bp-1F4h]@79
   DDBLTFX Dst; // [sp+Ch] [bp-1E0h]@18
   DDSURFACEDESC2 pDesc; // [sp+70h] [bp-17Ch]@18
-  RECT v84; // [sp+ECh] [bp-100h]@26
+  RECT dest_rect; // [sp+ECh] [bp-100h]@26
   const char *string_name[10]; // [sp+FCh] [bp-F0h]@145
   const char *content[11]; // [sp+124h] [bp-C8h]@127
   unsigned char resistances[11]; // [sp+124h] [bp-C8h]@127
@@ -525,11 +525,14 @@
   //if ( pRenderer->pRenderD3D )
   {
     v106.uScreenSpaceY = v115 + v106.uViewportY + pSprites_LOD->pHardwareSprites[v10->pHwSpriteIDs[0]].uBufferHeight;
-    memset(&Dst, 0, 0x64u);
-    Dst.dwSize = 100;
+
+    memset(&Dst, 0, sizeof(Dst));
+    Dst.dwSize = sizeof(Dst);
     Dst.dwFillColor = 0;
-    memset(&pDesc, 0, 0x7Cu);
-    pDesc.dwSize = 124;
+
+    memset(&pDesc, 0, sizeof(pDesc));
+    pDesc.dwSize = sizeof(pDesc);
+
     pSprites_LOD->pHardwareSprites[v10->pHwSpriteIDs[0]].pTextureSurface->GetSurfaceDesc(&pDesc);
     v107 = 0;
     uint i = 0;
@@ -555,11 +558,12 @@
       dst_w = v106.uViewportW;
     pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0x7FF);
     pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0x7FF);
-    v84.left = v106.uViewportX;
-    v84.top = v106.uViewportY;
-    v84.right = v106.uViewportZ;
-    v84.bottom = v106.uViewportW;
-    ErrD3D(pRenderer->pBackBuffer4->Blt(&v84, 0, 0, 16778240u, &Dst));
+    dest_rect.left = v106.uViewportX;
+    dest_rect.top = v106.uViewportY;
+    dest_rect.right = v106.uViewportZ;
+    dest_rect.bottom = v106.uViewportW;
+
+    ErrD3D(pRenderer->pBackBuffer4->Blt(&dest_rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &Dst));
     /*if ( pRenderer->uTargetGBits == 5 )
     {
       __debugbreak(); // no monster popup for r5g5b5 will be
@@ -609,8 +613,8 @@
     }
     else*/
     {
-      memset(&pDesc, 0, 0x7Cu);
-      pDesc.dwSize = 124;
+      memset(&pDesc, 0, sizeof(pDesc));
+      pDesc.dwSize = sizeof(pDesc);
       if ( pRenderer->LockSurface_DDraw4(pSprites_LOD->pHardwareSprites[v10->pHwSpriteIDs[0]].pTextureSurface, &pDesc, DDLOCK_WAIT) )
       {
         ushort* src = (unsigned __int16 *)pDesc.lpSurface;