Mercurial > mm7
comparison mm7_3.cpp @ 152:796b79187c27
Слияние
author | Ritor1 |
---|---|
date | Tue, 12 Feb 2013 15:28:36 +0600 |
parents | 9abdd40a107b 8ab4484c22e0 |
children | 86a2637ba125 |
comparison
equal
deleted
inserted
replaced
151:9abdd40a107b | 152:796b79187c27 |
---|---|
12921 LODWORD(v21) = pBLVRenderParams->field_40 << 16; | 12921 LODWORD(v21) = pBLVRenderParams->field_40 << 16; |
12922 HIDWORD(v21) = pBLVRenderParams->field_40 >> 16; | 12922 HIDWORD(v21) = pBLVRenderParams->field_40 >> 16; |
12923 v37 = v21 / x; | 12923 v37 = v21 / x; |
12924 LODWORD(v31) = v12->scale; | 12924 LODWORD(v31) = v12->scale; |
12925 v37 = v21 / x; | 12925 v37 = v21 / x; |
12926 v15->field_0 = (unsigned __int64)(SLODWORD(v31) * v21 / x) >> 16; | 12926 v15->_screenspace_x_scaler_packedfloat = (unsigned __int64)(SLODWORD(v31) * v21 / x) >> 16; |
12927 v37 = (unsigned __int64)(v12->scale * (signed __int64)v37) >> 16; | 12927 v37 = (unsigned __int64)(v12->scale * (signed __int64)v37) >> 16; |
12928 } | 12928 } |
12929 else | 12929 else |
12930 { | 12930 { |
12931 v17 = &pGame->pIndoorCameraD3D; | 12931 v17 = &pGame->pIndoorCameraD3D; |
12938 LODWORD(v20) = 0; | 12938 LODWORD(v20) = 0; |
12939 HIDWORD(v20) = SLOWORD(v25); | 12939 HIDWORD(v20) = SLOWORD(v25); |
12940 v37 = v20 / x; | 12940 v37 = v20 / x; |
12941 LODWORD(v31) = v12->scale; | 12941 LODWORD(v31) = v12->scale; |
12942 v37 = (unsigned __int64)(SLODWORD(v31) * v20 / x) >> 16; | 12942 v37 = (unsigned __int64)(SLODWORD(v31) * v20 / x) >> 16; |
12943 v15->field_0 = (unsigned __int64)(SLODWORD(v31) * v20 / x) >> 16; | 12943 v15->_screenspace_x_scaler_packedfloat = (unsigned __int64)(SLODWORD(v31) * v20 / x) >> 16; |
12944 v31 = v15->fov_y; | 12944 v31 = v15->fov_y; |
12945 v25 = v31 + 6.7553994e15; | 12945 v25 = v31 + 6.7553994e15; |
12946 LODWORD(v20) = 0; | 12946 LODWORD(v20) = 0; |
12947 HIDWORD(v20) = SLOWORD(v25); | 12947 HIDWORD(v20) = SLOWORD(v25); |
12948 v37 = v20 / x; | 12948 v37 = v20 / x; |
12949 v37 = (unsigned __int64)(v12->scale * v20 / x) >> 16; | 12949 v37 = (unsigned __int64)(v12->scale * v20 / x) >> 16; |
12950 } | 12950 } |
12951 HIWORD(v22) = HIWORD(x); | 12951 HIWORD(v22) = HIWORD(x); |
12952 v15->field_4 = v37; | 12952 v15->_screenspace_y_scaler_packedfloat = v37; |
12953 v15->field_1E = v30; | 12953 v15->field_1E = v30; |
12954 v15->some_x = a1; | 12954 v15->some_x = a1; |
12955 v15->some_y = a2; | 12955 v15->some_y = a2; |
12956 v15->some_z = a3; | 12956 v15->some_z = a3; |
12957 v15->uScreenSpaceX = a5; | 12957 v15->uScreenSpaceX = a5; |
13106 if ( v12 ) | 13106 if ( v12 ) |
13107 { | 13107 { |
13108 LODWORD(v19) = pBLVRenderParams->field_40 << 16; | 13108 LODWORD(v19) = pBLVRenderParams->field_40 << 16; |
13109 HIDWORD(v19) = pBLVRenderParams->field_40 >> 16; | 13109 HIDWORD(v19) = pBLVRenderParams->field_40 >> 16; |
13110 v20 = v19 / x; | 13110 v20 = v19 / x; |
13111 v3->field_0 = (unsigned __int64)(v24->scale * v19 / x) >> 16; | 13111 v3->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v24->scale * v19 / x) >> 16; |
13112 v31 = (unsigned __int64)(v24->scale * (signed __int64)v20) >> 16; | 13112 v31 = (unsigned __int64)(v24->scale * (signed __int64)v20) >> 16; |
13113 } | 13113 } |
13114 else | 13114 else |
13115 { | 13115 { |
13116 v3->fov_x = pGame->pIndoorCameraD3D->fov_x; | 13116 v3->fov_x = pGame->pIndoorCameraD3D->fov_x; |
13117 v3->fov_y = pGame->pIndoorCameraD3D->fov_y; | 13117 v3->fov_y = pGame->pIndoorCameraD3D->fov_y; |
13118 v18 = (int)floorf(v3->fov_x + 0.5f) / x; | 13118 v18 = (int)floorf(v3->fov_x + 0.5f) / x; |
13119 v3->field_0 = (unsigned __int64)(v24->scale * (__int64)v18) >> 16; | 13119 v3->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v24->scale * (__int64)v18) >> 16; |
13120 v31 = (unsigned __int64)(v24->scale * (__int64)v18) >> 16; | 13120 v31 = (unsigned __int64)(v24->scale * (__int64)v18) >> 16; |
13121 } | 13121 } |
13122 HIWORD(v21) = HIWORD(x); | 13122 HIWORD(v21) = HIWORD(x); |
13123 v3->field_4 = v31; | 13123 v3->_screenspace_y_scaler_packedfloat = v31; |
13124 v3->field_1E = v34; | 13124 v3->field_1E = v34; |
13125 v3->some_x = a1; | 13125 v3->some_x = a1; |
13126 v3->some_y = a2; | 13126 v3->some_y = a2; |
13127 v3->some_z = a3; | 13127 v3->some_z = a3; |
13128 v3->uScreenSpaceX = v36; | 13128 v3->uScreenSpaceX = v36; |
13529 v11 = *((int *)v3 + 1); | 13529 v11 = *((int *)v3 + 1); |
13530 v13 = v6->scale; | 13530 v13 = v6->scale; |
13531 v13 = (unsigned __int64)(v11 * (signed __int64)v13) >> 16; | 13531 v13 = (unsigned __int64)(v11 * (signed __int64)v13) >> 16; |
13532 v10.uScreenSpaceX = *((short *)v3 - 2); | 13532 v10.uScreenSpaceX = *((short *)v3 - 2); |
13533 v10.uScreenSpaceY = *((short *)v3 - 1); | 13533 v10.uScreenSpaceY = *((short *)v3 - 1); |
13534 v10.field_10 = v13; | 13534 v10._screenspace_x_scaler_packedfloat = v13; |
13535 v10.field_14 = v13; | 13535 v10._screenspace_y_scaler_packedfloat = v13; |
13536 v10.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v6->uPaletteIndex, 0, 1); | 13536 v10.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v6->uPaletteIndex, 0, 1); |
13537 v8 = *((short *)v3 - 5); | 13537 v8 = *((short *)v3 - 5); |
13538 v10.sZValue = 0; | 13538 v10.sZValue = 0; |
13539 v10.uFlags = 0; | 13539 v10.uFlags = 0; |
13540 v9 = pOverlayList->pOverlays[v8].uOverlayType; | 13540 v9 = pOverlayList->pOverlays[v8].uOverlayType; |
13858 pRenderer->DrawTextureTransparent(uCenterX - 3, uCenterY - 3, | 13858 pRenderer->DrawTextureTransparent(uCenterX - 3, uCenterY - 3, |
13859 (Texture *)(pTextureIDs_pMapDirs[v35] != -1 ? &pIcons_LOD->pTextures[pTextureIDs_pMapDirs[v35]] : 0)); | 13859 (Texture *)(pTextureIDs_pMapDirs[v35] != -1 ? &pIcons_LOD->pTextures[pTextureIDs_pMapDirs[v35]] : 0)); |
13860 v36 = 255; | 13860 v36 = 255; |
13861 flagsb = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0xFFu); | 13861 flagsb = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0xFFu); |
13862 v60 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0); | 13862 v60 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0); |
13863 if ( bWizardEyeActive ) | 13863 if ( bWizardEyeActive = true) |
13864 { | 13864 { |
13865 uZe = 0; | 13865 uZe = 0; |
13866 //for (uint i = 0; i < uNumLayingItems; ++i) | 13866 //for (uint i = 0; i < uNumLayingItems; ++i) |
13867 if (uNumLayingItems > 0) | 13867 if (uNumLayingItems > 0) |
13868 { | 13868 { |