Mercurial > mm7
diff Render.cpp @ 2334:ddb803517a48
unused local variables I commented
| author | Ritor1 |
|---|---|
| date | Wed, 02 Apr 2014 21:05:19 +0600 |
| parents | 82851980e3d8 |
| children | d6887ee81068 |
line wrap: on
line diff
--- a/Render.cpp Wed Apr 02 20:53:47 2014 +0600 +++ b/Render.cpp Wed Apr 02 21:05:19 2014 +0600 @@ -228,7 +228,7 @@ { int v6; // ecx@8 struct Polygon *pTilePolygon; // ebx@8 - float Light_tile_dist; +// float Light_tile_dist; //warning: the game uses CW culling by default, ccw is incosistent pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_CULLMODE, D3DCULL_CCW); @@ -478,16 +478,16 @@ //__int16 v6; // di@3 //int v7; // eax@3 //int v8; // ebx@4 - unsigned __int16 *v9; // eax@7 - char v10; // zf@9 +// unsigned __int16 *v9; // eax@7 +// char v10; // zf@9 //DWORD v11; // eax@13 - int v12; // eax@13 - int v13; // eax@14 +// int v12; // eax@13 +// int v13; // eax@14 RenderBillboardTransform_local0 billboard; // [sp+4h] [bp-60h]@1 - int v15; // [sp+54h] [bp-10h]@13 +// int v15; // [sp+54h] [bp-10h]@13 //int v16; // [sp+58h] [bp-Ch]@1 //int v17; // [sp+5Ch] [bp-8h]@2 - int v18; // [sp+60h] [bp-4h]@13 +// int v18; // [sp+60h] [bp-4h]@13 billboard.sParentBillboardID = -1; billboard.pTarget = pRenderer->pTargetSurface; @@ -552,10 +552,10 @@ int v9; // ecx@10 int v17; // ecx@25 int v18; // eax@25 - int v22; // ST3C_4@29 +// int v22; // ST3C_4@29 signed __int64 v23; // qtt@30 int v26; // eax@31 - char v27; // zf@31 +// char v27; // zf@31 int v30; // [sp+14h] [bp-2Ch]@23 int v37; // [sp+1Ch] [bp-24h]@23 int a6; // [sp+20h] [bp-20h]@10 @@ -1811,55 +1811,55 @@ unsigned int v6; // ebx@1 LightmapBuilder *v7; // esi@3 int v8; // eax@7 - ODMFace *v9; // eax@12 - char *v10; // esi@12 - double v11; // st7@14 - double v12; // st7@14 - int v13; // eax@14 - ODMFace *v14; // ecx@14 - double v15; // st7@14 - float v16; // ST48_4@15 - int v17; // eax@15 - char v18; // zf@17 - HRESULT v19; // eax@18 - HRESULT v20; // eax@18 - HRESULT v21; // eax@20 - HRESULT v22; // eax@20 - unsigned int v23; // ecx@20 - char *v24; // eax@21 - HRESULT v25; // eax@23 - HRESULT v26; // eax@23 - HRESULT v27; // eax@24 - HRESULT v28; // eax@25 - HRESULT v29; // eax@25 - HRESULT v30; // eax@25 - HRESULT v31; // eax@25 - HRESULT v32; // eax@26 - unsigned int v33; // ecx@26 - char *v34; // eax@27 - int v35; // edx@28 - HRESULT v36; // eax@29 - HRESULT v37; // eax@29 - HRESULT v38; // eax@29 - HRESULT v39; // eax@29 +// ODMFace *v9; // eax@12 +// char *v10; // esi@12 +// double v11; // st7@14 +// double v12; // st7@14 +// int v13; // eax@14 +// ODMFace *v14; // ecx@14 +// double v15; // st7@14 +// float v16; // ST48_4@15 +// int v17; // eax@15 +// char v18; // zf@17 +// HRESULT v19; // eax@18 +// HRESULT v20; // eax@18 +// HRESULT v21; // eax@20 +// HRESULT v22; // eax@20 +// unsigned int v23; // ecx@20 +// char *v24; // eax@21 +// HRESULT v25; // eax@23 +// HRESULT v26; // eax@23 +// HRESULT v27; // eax@24 +// HRESULT v28; // eax@25 +// HRESULT v29; // eax@25 +// HRESULT v30; // eax@25 +// HRESULT v31; // eax@25 +// HRESULT v32; // eax@26 +// unsigned int v33; // ecx@26 +// char *v34; // eax@27 +// int v35; // edx@28 +// HRESULT v36; // eax@29 +// HRESULT v37; // eax@29 +// HRESULT v38; // eax@29 +// HRESULT v39; // eax@29 //IDirect3DDevice3Vtbl *v40; // ebx@29 unsigned int v41; // eax@29 - HRESULT v42; // eax@30 - HRESULT v43; // eax@30 - HRESULT v44; // eax@30 - char *v45; // esi@34 - int v46; // ecx@35 - double v47; // st6@35 - int v48; // eax@36 - const char *v49; // [sp+4Ch] [bp-1Ch]@0 - const char *v50; // [sp+4Ch] [bp-1Ch]@20 - int v51; // [sp+50h] [bp-18h]@0 - unsigned int v52; // [sp+54h] [bp-14h]@0 +// HRESULT v42; // eax@30 +// HRESULT v43; // eax@30 +// HRESULT v44; // eax@30 +// char *v45; // esi@34 +// int v46; // ecx@35 +// double v47; // st6@35 +// int v48; // eax@36 +// const char *v49; // [sp+4Ch] [bp-1Ch]@0 +// const char *v50; // [sp+4Ch] [bp-1Ch]@20 +// int v51; // [sp+50h] [bp-18h]@0 +// unsigned int v52; // [sp+54h] [bp-14h]@0 LightmapBuilder *v53; // [sp+58h] [bp-10h]@3 unsigned int v54; // [sp+5Ch] [bp-Ch]@3 - unsigned int v55; // [sp+5Ch] [bp-Ch]@34 - unsigned int v56; // [sp+60h] [bp-8h]@12 - int v57; // [sp+60h] [bp-8h]@34 +// unsigned int v55; // [sp+5Ch] [bp-Ch]@34 +// unsigned int v56; // [sp+60h] [bp-8h]@12 +// int v57; // [sp+60h] [bp-8h]@34 signed int a2; // [sp+64h] [bp-4h]@4 v5 = this; @@ -2039,8 +2039,8 @@ Render::Render() { //Render *v1; // esi@1 - int v2; // eax@1 - char v3; // zf@1 +// int v2; // eax@1 +// char v3; // zf@1 //v1 = this; this->pDirectDraw4 = 0; @@ -2156,10 +2156,10 @@ int v5; // eax@8 FILE *pOutFile; // edi@10 unsigned short *v8; // eax@11 - int v9; // eax@13 - int v10; // ecx@15 +// int v9; // eax@13 +// int v10; // ecx@15 signed int v12; // eax@18 - HRESULT v14; // eax@29 +// HRESULT v14; // eax@29 char v15[56]; // [sp+Ch] [bp-158h]@10 DDSURFACEDESC2 Dst; // [sp+48h] [bp-11Ch]@7 char color_map[48]; // [sp+C4h] [bp-A0h]@10 @@ -2311,19 +2311,19 @@ { unsigned int v6; // eax@8 //FILE *v7; // edi@10 - int v8; // ecx@11 +// int v8; // ecx@11 unsigned short *v9; // eax@11 int v10; // eax@13 signed int v13; // eax@18 - char v14; // zf@27 - HRESULT v15; // eax@29 +// char v14; // zf@27 +// HRESULT v15; // eax@29 char v16[56]; // [sp+Ch] [bp-12Ch]@10 __int16 v17; // [sp+44h] [bp-F4h]@10 DDSURFACEDESC2 Dst; // [sp+48h] [bp-F0h]@7 - int v19; // [sp+58h] [bp-E0h]@8 - unsigned __int16 *v20; // [sp+6Ch] [bp-CCh]@8 +// int v19; // [sp+58h] [bp-E0h]@8 +// unsigned __int16 *v20; // [sp+6Ch] [bp-CCh]@8 char color_map[48]; // [sp+C4h] [bp-74h]@10 - unsigned int v22; // [sp+F4h] [bp-44h]@11 +// unsigned int v22; // [sp+F4h] [bp-44h]@11 char *lineB; // [sp+F8h] [bp-40h]@14 int image_width; // [sp+FCh] [bp-3Ch]@11 int v25; // [sp+100h] [bp-38h]@4 @@ -2477,11 +2477,11 @@ void *v8; // esi@3 void *v9; // esi@3 unsigned short* v11; // eax@4 - int v13; // eax@8 - int v14; // ecx@8 +// int v13; // eax@8 +// int v14; // ecx@8 signed int v15; // eax@11 - char v16; // zf@20 - int result; // eax@21 +// char v16; // zf@20 +// int result; // eax@21 char v18[58]; // [sp+Ch] [bp-ACh]@3 char v20[48]; // [sp+48h] [bp-70h]@3 char *lineG; // [sp+78h] [bp-40h]@7 @@ -2619,14 +2619,14 @@ FILE *result; // eax@1 FILE *pOutFile; // edi@4 unsigned short* v9; // eax@5 - int v10; // eax@7 +// int v10; // eax@7 signed int v12; // eax@12 - char v13; // zf@21 +// char v13; // zf@21 char v14[56]; // [sp+4h] [bp-A0h]@4 __int16 v15; // [sp+3Ch] [bp-68h]@4 char color_map[48]; // [sp+40h] [bp-64h]@4 int v18; // [sp+74h] [bp-30h]@5 - char *v19; // [sp+78h] [bp-2Ch]@5 +// char *v19; // [sp+78h] [bp-2Ch]@5 int image_width; // [sp+7Ch] [bp-28h]@5 PCXHeader_1 header1; // [sp+80h] [bp-24h]@4 PCXHeader_2 header2; // [sp+90h] [bp-14h]@4 @@ -2836,18 +2836,18 @@ //RenderD3D *v2; // ecx@1 //char v3; // zf@4 //void *v4; // ebx@6 - IDirectDraw *v5; // eax@10 - IDirectDrawSurface2 *v6; // eax@11 - IDirectDrawSurface2 *v7; // eax@13 - IDirectDrawSurface2 *v8; // eax@15 - IDirectDraw2 *v9; // eax@17 - IDirectDraw4 *v10; // eax@19 - IDirectDrawSurface4 *v11; // eax@20 - IDirectDrawSurface4 *v12; // eax@22 - IDirectDrawSurface4 *v13; // eax@24 - IDirectDraw4 *v14; // eax@26 - unsigned __int16 **v15; // ebx@28 - void **v16; // esi@29 +// IDirectDraw *v5; // eax@10 +// IDirectDrawSurface2 *v6; // eax@11 +// IDirectDrawSurface2 *v7; // eax@13 +// IDirectDrawSurface2 *v8; // eax@15 +// IDirectDraw2 *v9; // eax@17 +// IDirectDraw4 *v10; // eax@19 +// IDirectDrawSurface4 *v11; // eax@20 +// IDirectDrawSurface4 *v12; // eax@22 +// IDirectDrawSurface4 *v13; // eax@24 +// IDirectDraw4 *v14; // eax@26 +// unsigned __int16 **v15; // ebx@28 +// void **v16; // esi@29 v1 = this; if (pRenderD3D) @@ -2990,23 +2990,23 @@ void Present_NoColorKey() { //unsigned __int16 *v0; // eax@4 - unsigned __int16 *v1; // esi@4 +// unsigned __int16 *v1; // esi@4 void *v2; // edi@4 //signed int v4; // ebx@4 //signed int v5; // ebx@6 //void *v6; // edi@7 //const void *v7; // esi@7 - signed int v8; // ebx@8 +// signed int v8; // ebx@8 int v9; // eax@10 unsigned int v10; // esi@10 unsigned __int32 v11; // edi@10 //int v12; // ecx@10 unsigned int v13; // ebx@10 - int v14; // eax@11 - int v15; // eax@13 - int v16; // eax@14 - int v17; // eax@16 - HRESULT v18; // eax@22 +// int v14; // eax@11 +// int v15; // eax@13 +// int v16; // eax@14 +// int v17; // eax@16 +// HRESULT v18; // eax@22 DDSURFACEDESC2 Dst; // [sp+Ch] [bp-98h]@3 //int v20; // [sp+88h] [bp-1Ch]@10 int v21; // [sp+8Ch] [bp-18h]@10 @@ -3172,21 +3172,21 @@ RenderD3D *v9; // ecx@13 unsigned int v10; // eax@13 RenderD3D *v11; // eax@25 - HRESULT v12; // eax@25 +// HRESULT v12; // eax@25 int v13; // ecx@25 int v14; // eax@27 signed int v15; // ebx@31 //bool v16; // eax@35 //char v17; // zf@35 - IDirectDraw4 *v18; // eax@38 - HRESULT v19; // eax@38 +// IDirectDraw4 *v18; // eax@38 +// HRESULT v19; // eax@38 //int *v20; // eax@39 int *v22; // eax@42 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 +// DDSURFACEDESC2 ddsd2; // [sp+280h] [bp-8Ch]@38 void *v28; // [sp+2FCh] [bp-10h]@2 int v29; // [sp+308h] [bp-4h]@2 @@ -3389,23 +3389,23 @@ bool v7; // eax@7 //RenderD3D *v8; // ecx@12 unsigned int v9; // eax@12 - RenderD3D *v10; // eax@24 - HRESULT v11; // eax@24 +// RenderD3D *v10; // eax@24 +// HRESULT v11; // eax@24 int v12; // eax@24 int v13; // eax@26 //bool v14; // eax@32 //char v15; // zf@32 - IDirectDraw4 *v16; // eax@35 - HRESULT v17; // eax@35 +// IDirectDraw4 *v16; // eax@35 +// HRESULT v17; // eax@35 //int *v18; // eax@36 - int *v19; // edx@38 - int v20; // eax@38 - unsigned int v21; // ecx@38 - int v22; // eax@41 +// int *v19; // edx@38 +// int v20; // eax@38 +// unsigned int v21; // ecx@38 +// int v22; // eax@41 D3DDEVICEDESC refCaps; // [sp+Ch] [bp-300h]@24 DDSURFACEDESC2 pDesc; // [sp+108h] [bp-204h]@37 D3DDEVICEDESC halCaps; // [sp+184h] [bp-188h]@24 - DDSURFACEDESC2 ddsd2; // [sp+280h] [bp-8Ch]@35 +// DDSURFACEDESC2 ddsd2; // [sp+280h] [bp-8Ch]@35 //RenderD3D *thisa; // [sp+2FCh] [bp-10h]@2 int v29; // [sp+308h] [bp-4h]@2 @@ -3620,8 +3620,8 @@ //----- (0044F2B2) -------------------------------------------------------- bool Render::IsGammaSupported() { - bool result; // eax@3 - HRESULT v1; // eax@4 +// bool result; // eax@3 +// HRESULT v1; // eax@4 //if ( pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || pVersion->pVersionInfo.dwMajorVersion != 4 ) { @@ -3640,7 +3640,7 @@ void Render::RasterLine2D(signed int uX, signed int uY, signed int uZ, signed int uW, unsigned __int16 uColor) { signed int lower_bound; // eax@17 - signed int left_bound; +// signed int left_bound; unsigned int v21; // edi@46 int v22; // esi@47 int v23; // ebx@47 @@ -3925,8 +3925,8 @@ //IDirectDrawSurface4 *v4; // esi@1 HRESULT result; // eax@1 HRESULT v6; // eax@4 - int v7; // [sp-8h] [bp-14h]@10 - unsigned int v8; // [sp-4h] [bp-10h]@10 +// int v7; // [sp-8h] [bp-14h]@10 +// unsigned int v8; // [sp-4h] [bp-10h]@10 char v9; // [sp+Bh] [bp-1h]@1 //v4 = pSurface; @@ -3955,7 +3955,7 @@ { //v8 = 0; //v7 = 2161; -LABEL_19: +//LABEL_19: //CheckHRESULT((CheckHRESULT_stru0 *)&pSurface, result, "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Screen16.cpp", v7, v8); goto LABEL_20; } @@ -3985,10 +3985,10 @@ void Render::CreateDirectDraw() { 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 +// 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; @@ -4006,10 +4006,10 @@ void Render::SetDirectDrawCooperationMode(HWND hWnd, bool bFullscreen) { DWORD flags; // eax@1 - IDirectDraw *v4; // ecx@3 - HRESULT v5; // eax@5 - int v6; // [sp-8h] [bp-8h]@3 - unsigned int v7; // [sp-4h] [bp-4h]@3 +// IDirectDraw *v4; // ecx@3 +//// HRESULT v5; // eax@5 +// int v6; // [sp-8h] [bp-8h]@3 +// unsigned int v7; // [sp-4h] [bp-4h]@3 flags = bFullscreen ? DDSCL_NORMAL | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN : DDSCL_NORMAL; @@ -4030,7 +4030,7 @@ IDirectDraw *pDD; // eax@3 IDirectDrawSurface **pOutSurf; // esi@3 struct _DDSURFACEDESC *v4; // edx@3 - HRESULT v5; // eax@5 +//// 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 @@ -4071,7 +4071,7 @@ IDirectDraw *v2; // eax@3 IDirectDrawSurface **ppBackBuffer; // esi@3 struct _DDSURFACEDESC *v4; // edx@3 - HRESULT v5; // eax@5 +// 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 @@ -4114,22 +4114,22 @@ { Render *v1; // esi@1 //int v2; // ebx@3 - IDirectDraw2 *v3; // eax@3 - HRESULT v4; // eax@3 +// IDirectDraw2 *v3; // eax@3 +// HRESULT v4; // eax@3 IDirectDrawSurface *pFrontBuffer; // eax@3 DDSCAPS2 *v6; // edx@3 IDirectDraw4 *v7; // eax@4 - HRESULT v8; // eax@4 +// HRESULT v8; // eax@4 int v9; // ST14_4@5 IDirectDrawSurface *v10; // ST10_4@5 - HRESULT v11; // eax@5 +// HRESULT v11; // eax@5 IDirectDrawSurface **ppBackBuffer; // [sp-4h] [bp-A4h]@3 - const char *v13; // [sp+0h] [bp-A0h]@0 - int v14; // [sp+4h] [bp-9Ch]@0 - unsigned int v15; // [sp+8h] [bp-98h]@0 +// const char *v13; // [sp+0h] [bp-A0h]@0 +// int v14; // [sp+4h] [bp-9Ch]@0 +// 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 +// int a4; // [sp+98h] [bp-8h]@3 v1 = this; //if (pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || @@ -4555,66 +4555,66 @@ //RenderVertexSoft *pVertices; // esi@0 //int v7; // edi@1 unsigned int v8; // ebx@1 - LightmapBuilder *v9; // esi@3 - unsigned int v10; // edx@3 +// LightmapBuilder *v9; // esi@3 +// unsigned int v10; // edx@3 int v11; // eax@5 - int v12; // eax@11 - char *v13; // esi@11 - double v14; // st7@13 - double v15; // st7@13 - signed int v16; // eax@13 - int v17; // ecx@13 - double v18; // st7@13 - float v19; // ST78_4@14 +// int v12; // eax@11 +// char *v13; // esi@11 +// double v14; // st7@13 +// double v15; // st7@13 +// signed int v16; // eax@13 +// int v17; // ecx@13 +// double v18; // st7@13 +// float v19; // ST78_4@14 int v20; // eax@14 - char v21; // zf@16 - HRESULT v22; // eax@17 - HRESULT v23; // eax@17 - HRESULT v24; // eax@19 - HRESULT v25; // eax@19 - unsigned int v26; // ecx@19 - char *v27; // eax@20 - HRESULT v28; // eax@22 - HRESULT v29; // eax@22 - HRESULT v30; // eax@23 - HRESULT v31; // eax@24 - HRESULT v32; // eax@24 - HRESULT v33; // eax@24 - HRESULT v34; // eax@24 - HRESULT v35; // eax@25 - HRESULT v36; // eax@25 - unsigned int v37; // ecx@25 - char *v38; // eax@26 - int v39; // edx@27 - HRESULT v40; // eax@28 - HRESULT v41; // eax@28 - HRESULT v42; // eax@28 - HRESULT v43; // eax@28 +// char v21; // zf@16 +// HRESULT v22; // eax@17 +// HRESULT v23; // eax@17 +// HRESULT v24; // eax@19 +// HRESULT v25; // eax@19 +// unsigned int v26; // ecx@19 +// char *v27; // eax@20 +// HRESULT v28; // eax@22 +// HRESULT v29; // eax@22 +// HRESULT v30; // eax@23 +// HRESULT v31; // eax@24 +// HRESULT v32; // eax@24 +// HRESULT v33; // eax@24 +// HRESULT v34; // eax@24 +// HRESULT v35; // eax@25 +// HRESULT v36; // eax@25 +// unsigned int v37; // ecx@25 +// char *v38; // eax@26 +// int v39; // edx@27 +// HRESULT v40; // eax@28 +// HRESULT v41; // eax@28 +// HRESULT v42; // eax@28 +// HRESULT v43; // eax@28 //IDirect3DDevice3Vtbl *v44; // ebx@28 unsigned int v45; // eax@28 - HRESULT v46; // eax@29 - HRESULT v47; // eax@29 - HRESULT v48; // eax@29 +// HRESULT v46; // eax@29 +// HRESULT v47; // eax@29 +// HRESULT v48; // eax@29 //IDirect3DDevice3 *v49; // eax@35 //IDirect3DDevice3Vtbl *v50; // ecx@35 - int v51; // eax@40 - char *v52; // esi@40 - double v53; // st7@42 - double v54; // st7@42 - signed int v55; // eax@42 - int v56; // ecx@42 - double v57; // st7@42 - float v58; // ST7C_4@43 - int v59; // eax@43 +// int v51; // eax@40 +// char *v52; // esi@40 +// double v53; // st7@42 +// double v54; // st7@42 +// signed int v55; // eax@42 +// int v56; // ecx@42 +// double v57; // st7@42 +// float v58; // ST7C_4@43 +// int v59; // eax@43 //signed int v60; // [sp+78h] [bp-14h]@31 //RenderVertexSoft *v61; // [sp+7Ch] [bp-10h]@3 - const char *v62; // [sp+80h] [bp-Ch]@0 - const char *v63; // [sp+80h] [bp-Ch]@19 - int v64; // [sp+84h] [bp-8h]@0 - LightmapBuilder *v65; // [sp+88h] [bp-4h]@3 - unsigned int v66; // [sp+88h] [bp-4h]@40 - unsigned int a6a; // [sp+A0h] [bp+14h]@11 - int a7; +// const char *v62; // [sp+80h] [bp-Ch]@0 +// const char *v63; // [sp+80h] [bp-Ch]@19 +// int v64; // [sp+84h] [bp-8h]@0 +// LightmapBuilder *v65; // [sp+88h] [bp-4h]@3 +// unsigned int v66; // [sp+88h] [bp-4h]@40 +// unsigned int a6a; // [sp+A0h] [bp+14h]@11 +// int a7; //v7 = (int)this; v8 = 0; @@ -4859,7 +4859,7 @@ signed __int64 v6; // qax@3 int v12; // edx@7 int v13; // eax@7 - void *v15; // ecx@9 +// void *v15; // ecx@9 int v17; // edi@9 double v18; // st7@9 signed int v19; // ebx@9 @@ -4867,16 +4867,16 @@ int v21; // ebx@11 int v22; // eax@14 signed __int64 v23; // qtt@16 - double v24; // st7@16 - unsigned __int8 v25; // sf@16 - unsigned __int8 v26; // of@16 +// double v24; // st7@16 +// unsigned __int8 v25; // sf@16 +// unsigned __int8 v26; // of@16 double v28; // st7@20 - char *v29; // ebx@20 - char *v30; // edx@20 - unsigned __int8 v31; // c0@21 - unsigned __int8 v32; // c3@21 +// char *v29; // ebx@20 +// char *v30; // edx@20 +// unsigned __int8 v31; // c0@21 +// unsigned __int8 v32; // c3@21 double v33; // st6@23 - char *v34; // esi@30 +// char *v34; // esi@30 const void *v35; // ecx@31 int v36; // eax@31 const void *v37; // edi@31 @@ -4886,19 +4886,19 @@ int v41; // eax@36 signed __int64 v42; // qtt@39 int v43; // eax@39 - char v44; // zf@39 - double v45; // st7@39 - double v46; // st7@39 - unsigned int v47; // edx@40 +// char v44; // zf@39 +// double v45; // st7@39 +// double v46; // st7@39 +// unsigned int v47; // edx@40 double v48; // st7@41 - RenderVertexSoft *v49; // ebx@41 - void *v50; // edi@43 +// RenderVertexSoft *v49; // ebx@41 +// void *v50; // edi@43 double v51; // st7@46 - RenderVertexSoft *v52; // edx@46 - void *v53; // edi@48 - signed int v59; // [sp-4h] [bp-178h]@17 - struct Polygon *v60; // [sp+0h] [bp-174h]@17 - IDirect3DTexture2 *v61; // [sp+4h] [bp-170h]@17 +// RenderVertexSoft *v52; // edx@46 +// void *v53; // edi@48 +// signed int v59; // [sp-4h] [bp-178h]@17 +// struct Polygon *v60; // [sp+0h] [bp-174h]@17 +// IDirect3DTexture2 *v61; // [sp+4h] [bp-170h]@17 struct Polygon pSkyPolygon; // [sp+14h] [bp-160h]@6 unsigned int v63; // [sp+120h] [bp-54h]@7 unsigned int v65; // [sp+128h] [bp-4Ch]@1 @@ -5206,14 +5206,14 @@ { //Render *v8; // edi@1 //unsigned int v9; // esi@3 - RenderVertexSoft *v12; // ecx@9 - RenderVertexD3D3 *v13; // eax@9 - double v14; // st6@10 - int v15; // edx@10 - Texture *v16; // edx@10 - double v17; // st6@10 +// RenderVertexSoft *v12; // ecx@9 +// RenderVertexD3D3 *v13; // eax@9 +// double v14; // st6@10 +// int v15; // edx@10 +// Texture *v16; // edx@10 +// double v17; // st6@10 //char v18; // zf@10 - Texture *v19; // edx@10 +// Texture *v19; // edx@10 //Texture *v23; // edx@16 //char *v24; // ecx@16 //char *v25; // eax@16 @@ -5228,12 +5228,12 @@ //double v48; // st6@24 //int v49; // esi@24 //double v50; // st6@24 - const char *v53; // [sp-Ch] [bp-20h]@21 +// const char *v53; // [sp-Ch] [bp-20h]@21 //int v54; // [sp-8h] [bp-1Ch]@21 //unsigned int v55; // [sp-4h] [bp-18h]@21 - const char *v56; // [sp+0h] [bp-14h]@0 - int v57; // [sp+4h] [bp-10h]@0 - unsigned int v58; // [sp+8h] [bp-Ch]@0 +// const char *v56; // [sp+0h] [bp-14h]@0 +// int v57; // [sp+4h] [bp-10h]@0 +// unsigned int v58; // [sp+8h] [bp-Ch]@0 //LightmapBuilder *v59; // [sp+Ch] [bp-8h]@3 //int a3a; // [sp+10h] [bp-4h]@4 @@ -5254,7 +5254,7 @@ if (pFace->uAttributes & FACE_OUTLINED) { - int color; +// int color; if (GetTickCount() % 300 >= 150) uColor = sCorrectedColor = 0xFF20FF20; else uColor = sCorrectedColor = 0xFF109010; @@ -6088,7 +6088,7 @@ void Render::_4A4CC9_AddSomeBillboard(stru6_stru1_indoor_sw_billboard *a1, int diffuse) { unsigned int v5; // eax@7 - char *v7; // edx@8 +// char *v7; // edx@8 double v10; // st6@9 double v11; // st6@10 int v12; // ebx@13 @@ -6139,11 +6139,11 @@ //----- (004A4DE1) -------------------------------------------------------- bool Render::LoadTexture(const char *pName, unsigned int bMipMaps, IDirectDrawSurface4 **pOutSurface, IDirect3DTexture2 **pOutTexture) { - HRESULT v12; // eax@14 +// HRESULT v12; // eax@14 unsigned __int16 *v13; // ecx@19 unsigned __int16 *v14; // eax@19 DWORD v15; // edx@20 - HRESULT v16; // eax@23 +// HRESULT v16; // eax@23 stru350 Dst; // [sp+Ch] [bp-F8h]@12 HWLTexture* pHWLTexture = pD3DBitmaps.LoadTexture(pName, bMipMaps); @@ -6295,7 +6295,7 @@ /*int v3; // eax@5 unsigned __int16 **v4; // edi@6 char *v5; // ebx@7*/ - DDSURFACEDESC2 Dst; // [sp+Ch] [bp-7Ch]@4 +// DDSURFACEDESC2 Dst; // [sp+Ch] [bp-7Ch]@4 //v1 = this; v2 = this->uNumSceneBegins; @@ -6372,36 +6372,36 @@ unsigned int v7; // eax@6 double v8; // st5@6 double v9; // st4@6 - HRESULT v10; // eax@6 - HRESULT v11; // eax@6 - unsigned int result; // eax@6 - unsigned int v13; // eax@7 - unsigned __int16 *v14; // ecx@7 - int *v15; // eax@7 - unsigned int v16; // ecx@8 - __int16 v17; // ax@10 - int v18; // esi@10 - float v19; // edi@10 - void *v20; // esi@10 - int v21; // edx@10 - int v22; // ecx@11 - int v23; // edx@12 - __int16 v24; // ax@15 - int v25; // esi@15 - float v26; // edi@15 - char *v27; // esi@15 - int v28; // edx@15 - int v29; // ecx@16 - int v30; // edx@17 - int v31; // [sp-Ch] [bp-ACh]@11 - int v32; // [sp-Ch] [bp-ACh]@16 - const char *v33; // [sp+0h] [bp-A0h]@0 - int v34; // [sp+4h] [bp-9Ch]@0 - unsigned int v35; // [sp+8h] [bp-98h]@0 +// HRESULT v10; // eax@6 +// HRESULT v11; // eax@6 +// unsigned int result; // eax@6 +// unsigned int v13; // eax@7 +// unsigned __int16 *v14; // ecx@7 +// int *v15; // eax@7 +// unsigned int v16; // ecx@8 +// __int16 v17; // ax@10 +// int v18; // esi@10 +// float v19; // edi@10 +// void *v20; // esi@10 +// int v21; // edx@10 +// int v22; // ecx@11 +// int v23; // edx@12 +// __int16 v24; // ax@15 +// int v25; // esi@15 +// float v26; // edi@15 +// char *v27; // esi@15 +// int v28; // edx@15 +// int v29; // ecx@16 +// int v30; // edx@17 +// int v31; // [sp-Ch] [bp-ACh]@11 +// int v32; // [sp-Ch] [bp-ACh]@16 +// const char *v33; // [sp+0h] [bp-A0h]@0 +// int v34; // [sp+4h] [bp-9Ch]@0 +// unsigned int v35; // [sp+8h] [bp-98h]@0 RenderVertexD3D3 v36[4]; // [sp+Ch] [bp-94h]@6 - unsigned int v37; // [sp+8Ch] [bp-14h]@7 - int v38; // [sp+90h] [bp-10h]@7 - double v39; // [sp+94h] [bp-Ch]@6 +// unsigned int v37; // [sp+8Ch] [bp-14h]@7 +// int v38; // [sp+90h] [bp-10h]@7 +// double v39; // [sp+94h] [bp-Ch]@6 int v40; // [sp+9Ch] [bp-4h]@6 v3 = 0; @@ -6609,12 +6609,12 @@ //unsigned __int16 *v5; // edx@3 unsigned __int16 *v6; // esi@3 unsigned int v8; // eax@5 - //unsigned int v9; // ebx@5 + unsigned int v9; // ebx@5 unsigned int v11; // eax@7 unsigned int v12; // ebx@8 unsigned int v15; // eax@14 - //int v19; // [sp+10h] [bp-8h]@3 - unsigned int uOutXa; // [sp+20h] [bp+8h]@16 + int v19; // [sp+10h] [bp-8h]@3 +// unsigned int uOutXa; // [sp+20h] [bp+8h]@16 int v23; // [sp+28h] [bp+10h]@3 if ( this->uNumSceneBegins && a4 ) @@ -6623,31 +6623,35 @@ //v5 = &this->pTargetSurface[uOutX + uOutY * this->uTargetSurfacePitch]; v6 = a4->pPixels; v23 = a4->uHeight; - ///v19 = v4; + v19 = v4; if ( this->bClip ) { if ( (signed int)uOutX < (signed int)this->uClipX ) { v8 = this->uClipX - uOutX; - //v9 = uOutX - this->uClipX; + v9 = uOutX - this->uClipX; v8 *= 2; - v4 += uOutX - this->uClipX; + v4 += v9; v6 = (unsigned __int16 *)((char *)v6 + v8); //v5 = (unsigned __int16 *)((char *)v5 + v8); } if ( (signed int)uOutY < (signed int)this->uClipY ) { v11 = this->uClipY - uOutY; - v6 += a4->uWidth * v11; + v6 += v19 * v11; v23 += uOutY - this->uClipY; //v5 += this->uTargetSurfacePitch * v11; } v12 = max(this->uClipX, uOutX); if ( (signed int)(v4 + v12) > (signed int)this->uClipZ ) + { v4 = this->uClipZ - max(this->uClipX, uOutX); + } v15 = max(this->uClipY, uOutY); if ( (signed int)(v15 + v23) > (signed int)this->uClipW ) + { v23 = this->uClipW - max(this->uClipY, uOutY); + } } for (int y = 0; y < v23; y++) @@ -6659,7 +6663,7 @@ //++v5; ++v6; } - v6 += a4->uWidth - v4; + v6 += v19 - v4; //v5 += this->uTargetSurfacePitch - v4; } } @@ -6753,14 +6757,14 @@ unsigned int v14; // ebx@15 unsigned int v15; // esi@17 unsigned int v16; // edi@18 - char v17; // zf@29 +// char v17; // zf@29 int v18; // [sp+14h] [bp-Ch]@4 int v19; // [sp+18h] [bp-8h]@4 unsigned __int8 *v20; // [sp+1Ch] [bp-4h]@4 - int v21; // [sp+28h] [bp+8h]@25 - int v22; // [sp+28h] [bp+8h]@34 - unsigned int v23; // [sp+2Ch] [bp+Ch]@23 - unsigned int v24; // [sp+2Ch] [bp+Ch]@32 +// int v21; // [sp+28h] [bp+8h]@25 +// int v22; // [sp+28h] [bp+8h]@34 +// unsigned int v23; // [sp+2Ch] [bp+Ch]@23 +// unsigned int v24; // [sp+2Ch] [bp+Ch]@32 if ( this->uNumSceneBegins && a4 && a4->pPalette16 ) { @@ -7050,16 +7054,16 @@ signed int v18; // ebx@13 unsigned int v19; // edx@15 signed int v20; // esi@16 - int v21; // ebx@22 - char v22; // zf@28 - int v23; // ebx@31 +// int v21; // ebx@22 +// char v22; // zf@28 +// int v23; // ebx@31 unsigned __int16 v24; // si@35 int v25; // [sp+Ch] [bp-4h]@2 - int v26; // [sp+1Ch] [bp+Ch]@24 - int v27; // [sp+1Ch] [bp+Ch]@33 +// int v26; // [sp+1Ch] [bp+Ch]@24 +// int v27; // [sp+1Ch] [bp+Ch]@33 unsigned int v28; // [sp+20h] [bp+10h]@30 - unsigned int v29; // [sp+24h] [bp+14h]@22 - unsigned int v30; // [sp+24h] [bp+14h]@31 +// unsigned int v29; // [sp+24h] [bp+14h]@22 +// unsigned int v30; // [sp+24h] [bp+14h]@31 int a2 = x; int a3 = y; @@ -7338,12 +7342,12 @@ signed int v13; // esi@15 signed int v15; // esi@18 unsigned __int8 *v16; // ebx@22 - char v17; // zf@28 +// char v17; // zf@28 int v18; // [sp+10h] [bp-10h]@4 unsigned __int8 *v19; // [sp+18h] [bp-8h]@4 int v20; // [sp+1Ch] [bp-4h]@4 - int v21; // [sp+28h] [bp+8h]@24 - unsigned int v22; // [sp+2Ch] [bp+Ch]@22 +// int v21; // [sp+28h] [bp+8h]@24 +// unsigned int v22; // [sp+2Ch] [bp+Ch]@22 if (!uNumSceneBegins || !pTexture) return; @@ -7446,10 +7450,10 @@ unsigned int v19; // edx@20 int v20; // eax@27 int v21; // edx@29 - int v23; // [sp+Ch] [bp-Ch]@24 +// int v23; // [sp+Ch] [bp-Ch]@24 unsigned __int8 *v24; // [sp+14h] [bp-4h]@6 - int xa; // [sp+20h] [bp+8h]@26 - unsigned int ya; // [sp+24h] [bp+Ch]@24 +// int xa; // [sp+20h] [bp+8h]@26 +// unsigned int ya; // [sp+24h] [bp+Ch]@24 int Width; // [sp+2Ch] [bp+14h]@6 if ( this->uNumSceneBegins && a4 && a4->pPalette16 && a5 && a5->pPalette16 ) @@ -7554,7 +7558,7 @@ unsigned int v19; // edx@20 int v20; // eax@27 int v21; // edx@29 - int v23; // [sp+Ch] [bp-Ch]@24 +// int v23; // [sp+Ch] [bp-Ch]@24 int Height; // [sp+10h] [bp-8h]@6 int Width; // [sp+14h] [bp-4h]@6 int v27; // [sp+24h] [bp+Ch]@23 @@ -7977,12 +7981,12 @@ unsigned int v12; // esi@12 unsigned int v13; // esi@15 unsigned int v15; // esi@18 - char v17; // zf@26 +// char v17; // zf@26 int v18; // [sp+10h] [bp-10h]@4 unsigned __int8 *v19; // [sp+18h] [bp-8h]@4 int v20; // [sp+1Ch] [bp-4h]@4 - int uXa; // [sp+28h] [bp+8h]@24 - unsigned int uYa; // [sp+2Ch] [bp+Ch]@22 +// int uXa; // [sp+28h] [bp+8h]@24 +// unsigned int uYa; // [sp+2Ch] [bp+Ch]@22 if ( this->uNumSceneBegins ) { @@ -8090,7 +8094,7 @@ ObjectDesc *v5; // eax@26 RGBTexture *v6; // esi@33 const char *v8; // [sp-4h] [bp-28h]@33 - struct tagRECT Rect; // [sp+14h] [bp-10h]@15 +// struct tagRECT Rect; // [sp+14h] [bp-10h]@15 /*if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) ) { @@ -8684,7 +8688,7 @@ Texture *pFaceTexture; // eax@10 unsigned int v16; // edi@22 int v27; // eax@57 - int vertex_id; // eax@58 +// int vertex_id; // eax@58 unsigned int v34; // eax@80 int v40; // [sp-4h] [bp-5Ch]@2 int v49; // [sp+2Ch] [bp-2Ch]@10 @@ -9045,21 +9049,21 @@ unsigned int v6; // ecx@9 unsigned __int16 *v7; // edi@9 int j; // ecx@9 - unsigned int screen_x; // qax@18 - HRESULT v14; // eax@21 - int v15; // edi@29 - signed __int64 v16; // qax@30 - signed int v17; // edx@34 - unsigned __int16 *v18; // edi@36 - int k; // ecx@36 +// unsigned int screen_x; // qax@18 +// HRESULT v14; // eax@21 +// int v15; // edi@29 +// signed __int64 v16; // qax@30 +// signed int v17; // edx@34 +// unsigned __int16 *v18; // edi@36 +// int k; // ecx@36 DDSURFACEDESC2 Dst; // [sp+4h] [bp-A0h]@6 unsigned __int16 *pPixels; // [sp+80h] [bp-24h]@1 float interval_x; // [sp+84h] [bp-20h]@1 - unsigned __int16 *_this; // [sp+88h] [bp-1Ch]@21 + //unsigned __int16 *_this; // [sp+88h] [bp-1Ch]@21 float interval_y; // [sp+8Ch] [bp-18h]@1 - unsigned int screen_y; // [sp+90h] [bp-14h]@17 - int v28; // [sp+98h] [bp-Ch]@16 - int v29; // [sp+9Ch] [bp-8h]@15 +// unsigned int screen_y; // [sp+90h] [bp-14h]@17 +// int v28; // [sp+98h] [bp-Ch]@16 +// int v29; // [sp+9Ch] [bp-8h]@15 interval_x = game_viewport_width / (double)width; interval_y = game_viewport_height / (double)height; @@ -9326,11 +9330,11 @@ { double v6; // st7@2 //IDirect3DDevice3 *v7; // eax@2 - HRESULT v8; // eax@2 +// HRESULT v8; // eax@2 std::string v9; // [sp-18h] [bp-60h]@3 - const char *v10; // [sp-Ch] [bp-54h]@2 - const char *v11; // [sp-8h] [bp-50h]@2 - int v12; // [sp-4h] [bp-4Ch]@2 +// const char *v10; // [sp-Ch] [bp-54h]@2 +// const char *v11; // [sp-8h] [bp-50h]@2 +// int v12; // [sp-4h] [bp-4Ch]@2 RenderVertexD3D3 v13[2]; // [sp+8h] [bp-40h]@2 //if ( pRenderer->pRenderD3D )