mm7: Render.cpp comparison

comparison Render.cpp @ 2410:2d3c3d1dff0c

added RenderStruct.h

author	Ritor1
date	Tue, 15 Jul 2014 15:44:45 +0600
parents	2fe8feb3dcd1
children	e2d352b3a0a5

comparison

equal deleted inserted replaced

-:b29880e9ee79
+:2d3c3d1dff0c
 {
 //IDirectDraw4 *v8; // eax@12
 //IDirectDraw4 *v9; // eax@16
 //IDirectDraw4 *v10; // eax@20
 //IDirectDraw4 *v13; // eax@35
-const char *v23; // [sp-4h] [bp-DCh]@9
+//const char *v23; // [sp-4h] [bp-DCh]@9
-const char *v24; // [sp-4h] [bp-DCh]@13
+//const char *v24; // [sp-4h] [bp-DCh]@13
-const char *v25; // [sp-4h] [bp-DCh]@19
+//const char *v25; // [sp-4h] [bp-DCh]@19
 DWORD v26; // [sp-4h] [bp-DCh]@30
 DDSCAPS2 v27; // [sp+Ch] [bp-CCh]@37
 DDSURFACEDESC2 ddsd2; // [sp+1Ch] [bp-BCh]@11
 D3DVIEWPORT2 d3dvp2; // [sp+98h] [bp-40h]@28
 IDirectDrawClipper *v30; // [sp+C4h] [bp-14h]@18
 if (bWindowed && !pAvailableDevices[uDeviceID].pDirectDrawGUID)
 {
 if (FAILED(pHost->SetCooperativeLevel(hWnd, DDSCL_MULTITHREADED | DDSCL_NORMAL)))
 {
-v23 = "Init - Failed to set cooperative level.\n";
+sprintf(pErrorMessage, "Init - Failed to set cooperative level.\n");
-sprintf(pErrorMessage, v23);
-LABEL_65:
 if (pHost)
 {
 pHost->Release();
 pHost = 0;
 }
 {
 ddsd2.dwSize = sizeof(DDSURFACEDESC2);
 pHost->GetDisplayMode(&ddsd2);
 if ( FORCE_16_BITS && ddsd2.ddpfPixelFormat.dwRGBBitCount != 16 )
 {
-v24 = "Init - Desktop isn't in 16 bit mode.\n";
+sprintf(pErrorMessage, "Init - Desktop isn't in 16 bit mode.\n");
-goto LABEL_14;
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer = 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
 ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
 ddsd2.dwWidth = game_width;
 ddsd2.dwHeight = game_height;
 if (pHost->CreateSurface(&ddsd2, &pBackBuffer, 0) )
 {
-v24 = "Init - Failed to create back buffer.\n";
+sprintf(pErrorMessage, "Init - Failed to create back buffer.\n");
-LABEL_14:
-sprintf(pErrorMessage, v24);
 if (pFrontBuffer)
 {
 pFrontBuffer->Release();
 pFrontBuffer = 0;
 }
-goto LABEL_65;
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 if ( pHost->CreateClipper(0, &v30, 0) )
 {
-v25 = "Init - Failed to create clipper.\n";
+sprintf(pErrorMessage, "Init - Failed to create clipper.\n");
-goto LABEL_45;
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 v30->SetHWnd(0, hWnd);
 pFrontBuffer->SetClipper(v30);
 v30->Release();
 ddsd2.dwHeight = game_height;
 if ( pDirect3D->EnumZBufferFormats(*pAvailableDevices[uDeviceID].pGUID,
 (HRESULT (__stdcall *)(DDPIXELFORMAT *, void *))D3DZBufferFormatEnumerator,
 &ddsd2.ddpfPixelFormat) )
-goto LABEL_21;
+	  {
+sprintf(pErrorMessage, "Init - Failed to enumerate Z buffer formats.\n");
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+	  }
 if ( uDeviceID == 2 || uDeviceID == 3 )
 ddsd2.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
 if ( !pHost->CreateSurface(&ddsd2, &pZBuffer, 0) )
 {
 if ( !pBackBuffer->AddAttachedSurface(pZBuffer) )
 {
-if ( !pDirect3D->CreateDevice(*pAvailableDevices[uDeviceID].pGUID,
+if ( !pDirect3D->CreateDevice(*pAvailableDevices[uDeviceID].pGUID, pBackBuffer, &pDevice, 0) )
-pBackBuffer,
-&pDevice,
-0) )
 {
 memset(&d3dvp2, 0, sizeof(D3DVIEWPORT2));
 d3dvp2.dvClipWidth = 2.0;
 d3dvp2.dvClipY = 1.0;
 d3dvp2.dvClipHeight = 2.0;
 d3dvp2.dvMaxZ = 1.0;
 d3dvp2.dvMinZ = 0.0;
 goto LABEL_54;
 }
-LABEL_51:
 sprintf(pErrorMessage, "Init - Failed to create D3D device.\n");
 if (pDirect3D)
 {
 pDirect3D->Release();
 pDirect3D = 0;
 }
-goto LABEL_59;
+if (pZBuffer)
+{
+pZBuffer->Release();
+pZBuffer = 0;
+}
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
-LABEL_48:
 sprintf(pErrorMessage, "Init - Failed to attach z-buffer to back buffer.\n");
 if (pZBuffer)
 {
 pZBuffer->Release();
 pZBuffer = 0;
 }
-goto LABEL_61;
+if (pBackBuffer)
-}
+{
-goto LABEL_44;
+pBackBuffer->Release();
-}
+pBackBuffer = 0;
-LABEL_36:
+}
-v23 = "Init - Failed to create front buffer.\n";
+if (pFrontBuffer)
-sprintf(pErrorMessage, v23);
+{
-goto LABEL_65;
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+}
+sprintf(pErrorMessage, "Init - Failed to create z-buffer.\n");
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+}
+sprintf(pErrorMessage, "Init - Failed to create front buffer.\n");
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 if ( uDeviceID == 1 )
 v26 = 1045;
 else
 v26 = 1041;
 if (pHost->SetCooperativeLevel(hWnd, v26) )
 {
-v23 = "Init - Failed to set cooperative level.\n";
+sprintf(pErrorMessage, "Init - Failed to set cooperative level.\n");
-sprintf(pErrorMessage, v23);
+if (pHost)
-goto LABEL_65;
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 if (pHost->SetDisplayMode(window->GetWidth(), window->GetHeight(), 16, 0, 0) )
 {
-v23 = "Init - Failed to set display mode.\n";
+sprintf(pErrorMessage, "Init - Failed to set display mode.\n");
-sprintf(pErrorMessage, v23);
+if (pHost)
-goto LABEL_65;
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 memset(&ddsd2, 0, sizeof(DDSURFACEDESC2));
 ddsd2.dwSize = sizeof(DDSURFACEDESC2);
 ddsd2.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
 ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
 ddsd2.dwBackBufferCount = 1;
 if ( pHost->CreateSurface(&ddsd2, &pFrontBuffer, 0) )
-goto LABEL_36;
+{
+sprintf(pErrorMessage, "Init - Failed to create front buffer.\n");
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+}
 //a3a = &pBackBuffer;
 //v14 = *v34;
 memset(&v27, 0, sizeof(DDSCAPS2));
 v27.dwCaps = DDSCAPS_BACKBUFFER;
 //v33 = (IDirect3DDevice3 **)v14->GetAttachedSurface(&v27, &pBackBuffer);
 //hWnda = &pDirect3D;
 pHost->QueryInterface(IID_IDirect3D3, (LPVOID *)&pDirect3D);
 if (FAILED(pFrontBuffer->GetAttachedSurface(&v27, &pBackBuffer)))
 {
-v25 = "Init - Failed to get D3D interface.\n";
+sprintf(pErrorMessage, "Init - Failed to get D3D interface.\n");
-goto LABEL_45;
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
 ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
 ddsd2.dwWidth = 640;
 ddsd2.dwHeight = 480;
 if ( pDirect3D->EnumZBufferFormats(*pAvailableDevices[uDeviceID].pGUID,
 (HRESULT (__stdcall *)(DDPIXELFORMAT *, void *))D3DZBufferFormatEnumerator,
 &ddsd2.ddpfPixelFormat) )
 {
-LABEL_21:
+sprintf(pErrorMessage, "Init - Failed to enumerate Z buffer formats.\n");
-v25 = "Init - Failed to enumerate Z buffer formats.\n";
+if (pBackBuffer)
-goto LABEL_45;
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 if ( uDeviceID == 2 || uDeviceID == 3 )
 BYTE1(ddsd2.ddsCaps.dwCaps) |= 8u;
 //uDeviceIDa = &pZBuffer;
 if (pHost->CreateSurface(&ddsd2, &pZBuffer, 0) )
 {
-LABEL_44:
+sprintf(pErrorMessage, "Init - Failed to create z-buffer.\n");
-v25 = "Init - Failed to create z-buffer.\n";
-LABEL_45:
-sprintf(pErrorMessage, v25);
 if (pBackBuffer)
 {
 pBackBuffer->Release();
 pBackBuffer = 0;
 }
-LABEL_63:
-//v19 = &pFrontBuffer;
 if (pFrontBuffer)
 {
 pFrontBuffer->Release();
 pFrontBuffer= 0;
 }
-goto LABEL_65;
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 if (pBackBuffer->AddAttachedSurface(pZBuffer))
-goto LABEL_48;
+{
+sprintf(pErrorMessage, "Init - Failed to attach z-buffer to back buffer.\n");
+if (pZBuffer)
+{
+pZBuffer->Release();
+pZBuffer = 0;
+}
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+}
 //v33 = &pDevice;
-if (pDirect3D->CreateDevice(*pAvailableDevices[uDeviceID].pGUID,
+if (pDirect3D->CreateDevice(*pAvailableDevices[uDeviceID].pGUID, pBackBuffer, &pDevice, 0) )
-pBackBuffer,
+{
-&pDevice,
+sprintf(pErrorMessage, "Init - Failed to create D3D device.\n");
-0) )
+if (pDirect3D)
-goto LABEL_51;
+{
+pDirect3D->Release();
+pDirect3D = 0;
+}
+if (pZBuffer)
+{
+pZBuffer->Release();
+pZBuffer = 0;
+}
+if (pBackBuffer)
+{
+pBackBuffer->Release();
+pBackBuffer = 0;
+}
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
+}
 memset(&d3dvp2, 0, sizeof(D3DVIEWPORT2));
 d3dvp2.dvClipWidth = 2.0;
 d3dvp2.dvClipY = 1.0;
 d3dvp2.dvClipHeight = 2.0;
 d3dvp2.dvMaxZ = 1.0;
 if (pDirect3D)
 {
 pDirect3D->Release();
 pDirect3D = 0;
 }
-LABEL_59:
 if (pZBuffer)
 {
 pZBuffer->Release();
 pZBuffer = 0;
 }
-LABEL_61:
 if (pBackBuffer)
 {
 pBackBuffer->Release();
 pBackBuffer = 0;
 }
-goto LABEL_63;
+if (pFrontBuffer)
+{
+pFrontBuffer->Release();
+pFrontBuffer= 0;
+}
+if (pHost)
+{
+pHost->Release();
+pHost = 0;
+}
+return 0;
 }
 pDevice->AddViewport(pViewport);
 pViewport->SetViewport2(&d3dvp2);
 pDevice->SetCurrentViewport(pViewport);
 }
 //----- (0049FD3A) --------------------------------------------------------
 void Render::_49FD3A_fullscreen()
 {
-Render *v2; // esi@1
+//Render *v2; // esi@1
-IDirectDrawSurface4 *v3; // eax@6
+//IDirectDrawSurface4 *v3; // eax@6
-IDirectDrawSurface4 *v4; // ST0C_4@6
+//IDirectDrawSurface4 *v4; // ST0C_4@6
 RECT v5; // [sp+8h] [bp-10h]@6
-Render* a1 = this;
+//Render* a1 = this;
-v2 = a1;
+//v2 = this;
-if ( a1->pRenderD3D )
+if ( this->pRenderD3D )
 {
 if (pFrontBuffer4->IsLost() == DDERR_SURFACELOST)
 pFrontBuffer4->Restore();
 if (pBackBuffer4->IsLost() == DDERR_SURFACELOST)
 pBackBuffer4->Restore();
-v3 = v2->pBackBuffer4;
+//v3 = this->pBackBuffer4;
-v4 = v2->pFrontBuffer4;
+//v4 = this->pFrontBuffer4;
 v5.top = 0;
 v5.bottom = window->GetHeight();
 v5.left = 0;
 v5.right = window->GetWidth();
-v3->BltFast(0, 0, v4, &v5, 16u);
+this->pBackBuffer4->BltFast(0, 0, this->pFrontBuffer4, &v5, 16);
 }
 }
 //----- (0049FDBF) --------------------------------------------------------
 void Render::CreateZBuffer()
 }
 //----- (0049FE05) --------------------------------------------------------
 void Render::Release()
 {
-Render *v1; // esi@1
+//Render *v1; // esi@1
 //RenderD3D *v2; // ecx@1
 //char v3; // zf@4
 //void *v4; // ebx@6
 //  IDirectDraw *v5; // eax@10
 //  IDirectDrawSurface2 *v6; // eax@11
 //  IDirectDrawSurface4 *v13; // eax@24
 //  IDirectDraw4 *v14; // eax@26
 //  unsigned __int16 **v15; // ebx@28
 //  void **v16; // esi@29
-v1 = this;
+// v1 = this;
 if (pRenderD3D)
 {
-if ( v1->using_software_screen_buffer )
+if ( this->using_software_screen_buffer )
 {
 pRenderD3D->ClearTarget(true, 0, false, 1.0);
 pRenderD3D->Present(0);
 pRenderD3D->ClearTarget(true, 0, false, 1.0);
 }
-//v1->pColorKeySurface4 = 0;
+//this->pColorKeySurface4 = 0;
-v1->pBackBuffer4 = nullptr;
+this->pBackBuffer4 = nullptr;
-v1->pFrontBuffer4 = nullptr;
+this->pFrontBuffer4 = nullptr;
-v1->pDirectDraw4 = nullptr;
+this->pDirectDraw4 = nullptr;
-delete [] v1->pTargetSurface_unaligned;
+delete [] this->pTargetSurface_unaligned;
-v1->pTargetSurface = nullptr;
+this->pTargetSurface = nullptr;
-v1->pTargetSurface_unaligned = nullptr;
+this->pTargetSurface_unaligned = nullptr;
 if (pRenderD3D)
 {
 pRenderD3D->Release();
 delete pRenderD3D;
 }
 else
 ;//__debugbreak(); // no sr
 /*{
 if ( bWinNT4_0 == 1 )
 {
-v5 = (IDirectDraw *)v1->pDirectDraw2;
+v5 = (IDirectDraw *)this->pDirectDraw2;
 if ( !v5 )
 return;
-v5->SetCooperativeLevel(v1->hWnd, 8u);
+v5->SetCooperativeLevel(this->hWnd, 8u);
-v1->pDirectDraw2->FlipToGDISurface();
+this->pDirectDraw2->FlipToGDISurface();
-v6 = v1->pSomeSurface2;
+v6 = this->pSomeSurface2;
 if ( v6 )
 {
 v6->Release();
-v1->pSomeSurface2 = 0;
+this->pSomeSurface2 = 0;
 }
-v7 = v1->pBackBuffer2;
+v7 = this->pBackBuffer2;
 if ( v7 )
 {
 v7->Release();
-v1->pBackBuffer2 = 0;
+this->pBackBuffer2 = 0;
 }
-v8 = v1->pFrontBuffer2;
+v8 = this->pFrontBuffer2;
 if ( v8 )
 {
 v8->Release();
-v1->pFrontBuffer2 = 0;
+this->pFrontBuffer2 = 0;
 }
-v9 = v1->pDirectDraw2;
+v9 = this->pDirectDraw2;
 if ( v9 )
 {
 v9->Release();
-v1->pDirectDraw2 = 0;
+this->pDirectDraw2 = 0;
 }
 }
 else
 {
-v10 = v1->pDirectDraw4;
+v10 = this->pDirectDraw4;
 if ( !v10 )
 return;
-v10->SetCooperativeLevel(v1->hWnd, 1032u);
+v10->SetCooperativeLevel(this->hWnd, 1032u);
-v1->pDirectDraw4->FlipToGDISurface();
+this->pDirectDraw4->FlipToGDISurface();
-v11 = v1->pColorKeySurface4;
+v11 = this->pColorKeySurface4;
 if ( v11 )
 {
 v11->Release();
-v1->pColorKeySurface4 = 0;
+this->pColorKeySurface4 = 0;
 }
-v12 = v1->pBackBuffer4;
+v12 = this->pBackBuffer4;
 if ( v12 )
 {
 v12->Release();
-v1->pBackBuffer4 = 0;
+this->pBackBuffer4 = 0;
 }
-v13 = v1->pFrontBuffer4;
+v13 = this->pFrontBuffer4;
 if ( v13 )
 {
 v13->Release();
-v1->pFrontBuffer4 = 0;
+this->pFrontBuffer4 = 0;
 }
-v14 = v1->pDirectDraw4;
+v14 = this->pDirectDraw4;
 if ( v14 )
 {
 v14->Release();
-v1->pDirectDraw4 = 0;
+this->pDirectDraw4 = 0;
 }
 }
-v15 = &v1->pTargetSurface;
+v15 = &this->pTargetSurface;
-if ( v1->pTargetSurface )
+if ( this->pTargetSurface )
 {
-v16 = (void **)&v1->ptr_400E8;
+v16 = (void **)&this->ptr_400E8;
 free(*v16);
 *v15 = 0;
 *v16 = 0;
 }
 }*/
 }
 void Present32(unsigned __int32 *src, unsigned int src_pitch,
 unsigned __int32 *dst, unsigned int dst_pitch)
 {
 for (uint y = 0; y < 8; ++y)
 {
 //Render *v2; // esi@1
 //HWND v3; // ebx@1
 //void *v4; // eax@2
 //RenderD3D *v5; // eax@3
-unsigned int v6; // edx@5
+//unsigned int v6; // edx@5
 RenderD3D__DevInfo *v7; // ecx@5
 bool v8; // eax@6
-RenderD3D *v9; // ecx@13
+//RenderD3D *v9; // ecx@13
 unsigned int v10; // eax@13
-RenderD3D *v11; // eax@25
+//RenderD3D *v11; // eax@25
 //  HRESULT v12; // eax@25
 int v13; // ecx@25
 int v14; // eax@27
 signed int v15; // ebx@31
 //bool v16; // eax@35
 int v23; // ecx@42
 D3DDEVICEDESC refCaps; // [sp+Ch] [bp-300h]@25
 DDSURFACEDESC2 pDesc; // [sp+108h] [bp-204h]@40
 D3DDEVICEDESC halCaps; // [sp+184h] [bp-188h]@25
 //  DDSURFACEDESC2 ddsd2; // [sp+280h] [bp-8Ch]@38
-void *v28; // [sp+2FCh] [bp-10h]@2
+//void *v28; // [sp+2FCh] [bp-10h]@2
 int v29; // [sp+308h] [bp-4h]@2
 __debugbreak(); // Nomad
 //v2 = this;
 v15 = 1;
 }
 else
 {*/
 pRenderD3D = new RenderD3D;
-v28 = pRenderD3D;
+//v28 = pRenderD3D;
-v6 = uDesiredDirect3DDevice;
+//v6 = uDesiredDirect3DDevice;
 v29 = -1;
 v7 = pRenderD3D->pAvailableDevices;
-if ( v7[v6].bIsDeviceCompatible )
+if ( pRenderD3D->pAvailableDevices[uDesiredDirect3DDevice].bIsDeviceCompatible )
-{
+v8 = pRenderD3D->CreateDevice(uDesiredDirect3DDevice, /*0*/true, window);
-v8 = pRenderD3D->CreateDevice(v6, /*0*/true, window);
-}
 else
 {
 if ( v7[1].bIsDeviceCompatible )
-{
 v8 = pRenderD3D->CreateDevice(1, /*0*/true, window);
-}
 else
 {
 if ( !v7->bIsDeviceCompatible )
 Error("There aren't any D3D devices to create.");
 }
 }
 if ( !v8 )
 Error("D3Drend->Init failed.");
-v9 = pRenderD3D;
+//v9 = pRenderD3D;
-pBackBuffer4 = v9->pBackBuffer;
+pBackBuffer4 = pRenderD3D->pBackBuffer;
-pFrontBuffer4 = v9->pFrontBuffer;
+pFrontBuffer4 = pRenderD3D->pFrontBuffer;
-pDirectDraw4 = v9->pHost;
+pDirectDraw4 = pRenderD3D->pHost;
 v10 = pRenderD3D->GetDeviceCaps();
 if ( v10 & 1 )
 {
 if ( pRenderD3D )
 {
 //LOBYTE(field_10365C) = ~(unsigned __int8)(v10 >> 6) & 1;
 bRequiredTextureStagesAvailable = CheckTextureStages();
 memset(&halCaps, 0, 0xFCu);
 halCaps.dwSize = 252;
 memset(&refCaps, 0, 0xFCu);
-v11 = pRenderD3D;
+//v11 = pRenderD3D;
 refCaps.dwSize = 252;
-ErrD3D(v11->pDevice->GetCaps(&halCaps, &refCaps));
+ErrD3D(pRenderD3D->pDevice->GetCaps(&halCaps, &refCaps));
 v13 = halCaps.dwMinTextureWidth;
 if ( (unsigned int)halCaps.dwMinTextureWidth >= halCaps.dwMinTextureHeight )
 v13 = halCaps.dwMinTextureHeight;
 v14 = halCaps.dwMaxTextureWidth;
 uMinDeviceTextureDim = v13;
 pTargetSurface = (unsigned __int32 *)((char *)v22 + 2 * v23);
 }
 using_software_screen_buffer = v15;
 //}
 bWindowMode = 0;
-pParty->uFlags |= 2u;
+pParty->uFlags |= 2;
 pViewport->SetFOV(flt_6BE3A0 * 65536.0f);
 return v15 != 0;
 }
 //----- (004A05F3) --------------------------------------------------------
 }
 //----- (004A121C) --------------------------------------------------------
 void Render::CreateFrontBuffer()
 {
-Render *v1; // esi@1
+//Render *v1; // esi@1
 IDirectDraw *pDD; // eax@3
 IDirectDrawSurface **pOutSurf; // esi@3
 struct _DDSURFACEDESC *v4; // edx@3
 ////  HRESULT v5; // eax@5
 int v6; // [sp-8h] [bp-8Ch]@3
 unsigned int v7; // [sp-4h] [bp-88h]@3
 DDSURFACEDESC2 a2; // [sp+4h] [bp-80h]@3
-v1 = this;
+//v1 = this;
 //if (pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
 //pVersion->pVersionInfo.dwMajorVersion != 4 )
 {
 memset(&a2, 0, 0x7Cu);
-pDD = (IDirectDraw *)v1->pDirectDraw4;
+pDD = (IDirectDraw *)this->pDirectDraw4;
 a2.dwSize = 124;
 a2.dwFlags = 1;
 v7 = 0;
 a2.ddsCaps.dwCaps = 512;
 v6 = 2357;
-pOutSurf = (IDirectDrawSurface **)&v1->pFrontBuffer4;
+pOutSurf = (IDirectDrawSurface **)&this->pFrontBuffer4;
 v4 = (struct _DDSURFACEDESC *)&a2;
 }
 /*else
 {
 memset(&a2.lPitch, 0, 0x6Cu);               // DDSURFACEDESC here
 }
 //----- (004A12CD) --------------------------------------------------------
 void Render::CreateBackBuffer()
 {
-Render *v1; // esi@1
+//Render *v1; // esi@1
 IDirectDraw *v2; // eax@3
 IDirectDrawSurface **ppBackBuffer; // esi@3
 struct _DDSURFACEDESC *v4; // edx@3
 //  HRESULT v5; // eax@5
 int v6; // [sp-8h] [bp-8Ch]@3
 unsigned int v7; // [sp-4h] [bp-88h]@3
 DDSURFACEDESC2 a2; // [sp+4h] [bp-80h]@3
-v1 = this;
+//v1 = this;
 //if (pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
 //  pVersion->pVersionInfo.dwMajorVersion != 4 )
 {
 memset(&a2, 0, 0x7Cu);
-v2 = (IDirectDraw *)v1->pDirectDraw4;
+v2 = (IDirectDraw *)this->pDirectDraw4;
 a2.dwSize = 124;
 a2.dwFlags = 7;
 v7 = 0;
 a2.ddsCaps.dwCaps = 2112;
 a2.dwWidth = window->GetWidth();
 a2.dwHeight = window->GetHeight();
 v6 = 2387;
-ppBackBuffer = (IDirectDrawSurface **)&v1->pBackBuffer4;
+ppBackBuffer = (IDirectDrawSurface **)&this->pBackBuffer4;
 v4 = (struct _DDSURFACEDESC *)&a2;
 }
 /*else
 {
 memset(&a2.lPitch, 0, 0x6Cu);
 }
 //----- (004A139A) --------------------------------------------------------
 void Render::CreateDirectDrawPrimarySurface()
 {
-Render *v1; // esi@1
+//Render *v1; // esi@1
 //int v2; // ebx@3
 //  IDirectDraw2 *v3; // eax@3
 //  HRESULT v4; // eax@3
 IDirectDrawSurface *pFrontBuffer; // eax@3
 DDSCAPS2 *v6; // edx@3
 //  unsigned int v15; // [sp+8h] [bp-98h]@0
 DDSURFACEDESC2 ddsd2; // [sp+Ch] [bp-94h]@3
 DDSCAPS2 v17; // [sp+88h] [bp-18h]@4
 //  int a4; // [sp+98h] [bp-8h]@3
-v1 = this;
+//v1 = this;
 //if (pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
 //pVersion->pVersionInfo.dwMajorVersion != 4 )
 {
 //v2 = 0;
 //this->field_4004C = 1;
 memset(&ddsd2, 0, 0x7Cu);
-v7 = v1->pDirectDraw4;
+v7 = this->pDirectDraw4;
 ddsd2.dwBackBufferCount = 1;
 ddsd2.dwSize = 0x7Cu;
 ddsd2.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
 ddsd2.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_3DDEVICE | DDSCAPS_PRIMARYSURFACE;
-ErrD3D(v7->CreateSurface(
+ErrD3D(v7->CreateSurface(&ddsd2, &pFrontBuffer4, 0));
-&ddsd2,
+pFrontBuffer = (IDirectDrawSurface *)this->pFrontBuffer4;
-&pFrontBuffer4,
+ppBackBuffer = (IDirectDrawSurface **)&this->pBackBuffer4;
-0));
-pFrontBuffer = (IDirectDrawSurface *)v1->pFrontBuffer4;
-ppBackBuffer = (IDirectDrawSurface **)&v1->pBackBuffer4;
 }
 /*else
 {
 v2 = 0;
 this->field_4004C = 1;

Mercurial > mm7

comparison Render.cpp @ 2410:2d3c3d1dff0c