Mercurial > mm7

comparison mm7_3.cpp @ 675:92c1e1250e7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Thu, 14 Mar 2013 23:44:03 +0200
parents c508daac2c07 a5750c94b022
children ecfb1b3c9a39
comparison
equal deleted inserted replaced
674:c508daac2c07 675:92c1e1250e7c
10920 pSurfs = 0; 10920 pSurfs = 0;
10921 pNewEdges = 0; 10921 pNewEdges = 0;
10922 } 10922 }
10923 10923
10924 //----- (00486B4E) -------------------------------------------------------- 10924 //----- (00486B4E) --------------------------------------------------------
10925 char __fastcall sr_sub_486B4E_push_outdoor_edges(RenderVertexSoft *a1, int *a2, int *a3, stru148 *a4) 10925 char __fastcall sr_sub_486B4E_push_outdoor_edges(RenderVertexSoft *a1, int *a2, int *a3, stru148 *a4)//maybe DrawPolygonSW
10926 { 10926 {
10927 stru148 *v4; // esi@1 10927 stru148 *v4; // esi@1
10928 RenderVertexSoft *v5; // edi@1 10928 RenderVertexSoft *v5; // edi@1
10929 char v6; // zf@1 10929 char v6; // zf@1
10930 unsigned int v7; // eax@3 10930 unsigned int v7; // eax@3
11146 { 11146 {
11147 pBspRenderer->uNumFaceIDs = 0; 11147 pBspRenderer->uNumFaceIDs = 0;
11148 11148
11149 if (pBLVRenderParams->uPartySectorID) 11149 if (pBLVRenderParams->uPartySectorID)
11150 { 11150 {
11151 pBspRenderer->field_FA8[0].uSectorID = pBLVRenderParams->uPartySectorID; 11151 pBspRenderer->pSectors[0].uSectorID = pBLVRenderParams->uPartySectorID;
11152 pBspRenderer->field_FA8[0].uViewportW = pBLVRenderParams->uViewportW; 11152 pBspRenderer->pSectors[0].uViewportW = pBLVRenderParams->uViewportW;
11153 pBspRenderer->field_FA8[0].uViewportZ = pBLVRenderParams->uViewportZ; 11153 pBspRenderer->pSectors[0].uViewportZ = pBLVRenderParams->uViewportZ;
11154 pBspRenderer->field_FA8[0].uViewportY = pBLVRenderParams->uViewportY; 11154 pBspRenderer->pSectors[0].uViewportY = pBLVRenderParams->uViewportY;
11155 pBspRenderer->field_FA8[0].uViewportX = pBLVRenderParams->uViewportX; 11155 pBspRenderer->pSectors[0].uViewportX = pBLVRenderParams->uViewportX;
11156 pBspRenderer->field_FA8[0].field_C._43F9E1( 11156 pBspRenderer->pSectors[0].field_C._43F9E1(
11157 pBLVRenderParams->uViewportX, 11157 pBLVRenderParams->uViewportX,
11158 pBLVRenderParams->uViewportY, 11158 pBLVRenderParams->uViewportY,
11159 pBLVRenderParams->uViewportZ, 11159 pBLVRenderParams->uViewportZ,
11160 pBLVRenderParams->uViewportW); 11160 pBLVRenderParams->uViewportW);
11161 pBspRenderer->field_FA8[0].uFaceID = -1; 11161 pBspRenderer->pSectors[0].uFaceID = -1;
11162 pBspRenderer->field_FA8[0].std__vector_0007A8 = -1; 11162 pBspRenderer->pSectors[0].std__vector_0007A8 = -1;
11163 pBspRenderer->std__vector_000FA8 = 1; 11163 pBspRenderer->pNumSectors = 1;
11164 sub_440639(0); 11164 sub_440639(0);
11165 } 11165 }
11166 11166
11167 pBspRenderer->MakeVisibleSectorList(); 11167 pBspRenderer->MakeVisibleSectorList();
11168 } 11168 }
11522 signed int v2; // edi@1 11522 signed int v2; // edi@1
11523 BLVSector *v3; // esi@1 11523 BLVSector *v3; // esi@1
11524 11524
11525 v1 = a1; 11525 v1 = a1;
11526 v2 = 0; 11526 v2 = 0;
11527 v3 = &pIndoor->pSectors[pBspRenderer->field_FA8[a1].uSectorID]; 11527 v3 = &pIndoor->pSectors[pBspRenderer->pSectors[a1].uSectorID];
11528 if ( pRenderer->pRenderD3D ) 11528 if ( pRenderer->pRenderD3D )
11529 { 11529 {
11530 for (uint i = 0; i < v3->uNumNonBSPFaces; ++i) 11530 for (uint i = 0; i < v3->uNumNonBSPFaces; ++i)
11531 //Log::Warning(L"Non-BSP face: %X", v3->pFaceIDs[v2]); 11531 //Log::Warning(L"Non-BSP face: %X", v3->pFaceIDs[v2]);
11532 pBspRenderer->AddFaceToRenderList_d3d(v1, v3->pFaceIDs[i]); 11532 pBspRenderer->AddFaceToRenderList_d3d(v1, v3->pFaceIDs[i]);
11560 BspRenderer_stru0 *v12; // [sp+18h] [bp-4h]@1 11560 BspRenderer_stru0 *v12; // [sp+18h] [bp-4h]@1
11561 11561
11562 //Log::Warning(L"sub_4406BC(%u, %u)", a1, uFirstNode); 11562 //Log::Warning(L"sub_4406BC(%u, %u)", a1, uFirstNode);
11563 11563
11564 v10 = a1; 11564 v10 = a1;
11565 v12 = &pBspRenderer->field_FA8[a1]; 11565 v12 = &pBspRenderer->pSectors[a1];
11566 while ( 1 ) 11566 while ( 1 )
11567 { 11567 {
11568 v2 = &pIndoor->pSectors[v12->uSectorID]; 11568 v2 = &pIndoor->pSectors[v12->uSectorID];
11569 v3 = &pIndoor->pNodes[uFirstNode]; 11569 v3 = &pIndoor->pNodes[uFirstNode];
11570 v4 = &pIndoor->pFaces[v2->pFaceIDs[v3->uCoplanarOffset]]; 11570 v4 = &pIndoor->pFaces[v2->pFaceIDs[v3->uCoplanarOffset]];
16202 pArray[v3 / 8] &= ~set_bit; 16202 pArray[v3 / 8] &= ~set_bit;
16203 } 16203 }
16204 16204
16205 16205
16206 //----- (0044A56A) -------------------------------------------------------- 16206 //----- (0044A56A) --------------------------------------------------------
16207 void __cdecl sub_44A56A() 16207 void __cdecl Party__CountHirelings()
16208 { 16208 {
16209 pParty->field_70A = 0; 16209 pParty->field_70A = 0;
16210 16210
16211 for (int i = 0; i < pNPCStats->uNumNewNPCs; ++i) 16211 for (int i = 0; i < pNPCStats->uNumNewNPCs; ++i)
16212 { 16212 {