changeset 2414:0673a59ec9e5

Слияние
author Ritor1
date Wed, 16 Jul 2014 18:28:23 +0600
parents e2d352b3a0a5 (diff) e7a551f458e1 (current diff)
children f4af3b203f65
files
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Render.cpp	Wed Jul 16 17:22:12 2014 +0600
+++ b/Render.cpp	Wed Jul 16 18:28:23 2014 +0600
@@ -1803,18 +1803,18 @@
 unsigned int RenderD3D::GetDeviceCaps()
 {
   unsigned int v1; // ebx@1
-  RenderD3D *v2; // edi@1
+  //RenderD3D *v2; // edi@1
   IDirect3DDevice3 *v3; // eax@1
   unsigned int result; // eax@2
   D3DDEVICEDESC refCaps; // [sp+Ch] [bp-1F8h]@1
   D3DDEVICEDESC halCaps; // [sp+108h] [bp-FCh]@1
 
   v1 = 0;
-  v2 = this;
+  //v2 = this;
   memset(&halCaps, 0, 0xFCu);
   halCaps.dwSize = 252;
   memset(&refCaps, 0, 0xFCu);
-  v3 = v2->pDevice;
+  v3 = this->pDevice;
   refCaps.dwSize = 252;
   if ( v3->GetCaps(&halCaps, &refCaps) )
   {
@@ -2192,12 +2192,12 @@
 {
   Render *v1; // esi@1
 
-  v1 = this;
+  //v1 = this;
   free(this->pDefaultZBuffer);
-  v1->pD3DBitmaps.Release();
-  v1->pD3DSprites.Release();
+  this->pD3DBitmaps.Release();
+  this->pD3DSprites.Release();
   Release();
-  v1->bWindowMode = 1;
+  this->bWindowMode = 1;
   //nullsub_1();
   //nullsub_1();
 }
@@ -4140,14 +4140,14 @@
 //----- (004A10E4) --------------------------------------------------------
 void Render::CreateDirectDraw()
 {
-  Render *v1; // edi@1
+  //Render *v1; // edi@1
 //  HRESULT v2; // eax@1
 //  HRESULT v3; // eax@5
 //  int v6; // [sp-Ch] [bp-20h]@3
 //  unsigned int v9; // [sp+0h] [bp-14h]@0
   IDirectDraw *lpDD; // [sp+10h] [bp-4h]@1
 
-  v1 = this;
+  //v1 = this;
   ErrD3D(DirectDrawCreate(0, &lpDD, 0));
 
   pDirectDraw4 = nullptr;