Mercurial > mm7
diff mm7_3.cpp @ 675:92c1e1250e7c
Merge
author | Nomad |
---|---|
date | Thu, 14 Mar 2013 23:44:03 +0200 |
parents | c508daac2c07 a5750c94b022 |
children | ecfb1b3c9a39 |
line wrap: on
line diff
--- a/mm7_3.cpp Thu Mar 14 23:26:01 2013 +0200 +++ b/mm7_3.cpp Thu Mar 14 23:44:03 2013 +0200 @@ -10922,7 +10922,7 @@ } //----- (00486B4E) -------------------------------------------------------- -char __fastcall sr_sub_486B4E_push_outdoor_edges(RenderVertexSoft *a1, int *a2, int *a3, stru148 *a4) +char __fastcall sr_sub_486B4E_push_outdoor_edges(RenderVertexSoft *a1, int *a2, int *a3, stru148 *a4)//maybe DrawPolygonSW { stru148 *v4; // esi@1 RenderVertexSoft *v5; // edi@1 @@ -11148,19 +11148,19 @@ if (pBLVRenderParams->uPartySectorID) { - pBspRenderer->field_FA8[0].uSectorID = pBLVRenderParams->uPartySectorID; - pBspRenderer->field_FA8[0].uViewportW = pBLVRenderParams->uViewportW; - pBspRenderer->field_FA8[0].uViewportZ = pBLVRenderParams->uViewportZ; - pBspRenderer->field_FA8[0].uViewportY = pBLVRenderParams->uViewportY; - pBspRenderer->field_FA8[0].uViewportX = pBLVRenderParams->uViewportX; - pBspRenderer->field_FA8[0].field_C._43F9E1( + pBspRenderer->pSectors[0].uSectorID = pBLVRenderParams->uPartySectorID; + pBspRenderer->pSectors[0].uViewportW = pBLVRenderParams->uViewportW; + pBspRenderer->pSectors[0].uViewportZ = pBLVRenderParams->uViewportZ; + pBspRenderer->pSectors[0].uViewportY = pBLVRenderParams->uViewportY; + pBspRenderer->pSectors[0].uViewportX = pBLVRenderParams->uViewportX; + pBspRenderer->pSectors[0].field_C._43F9E1( pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY, pBLVRenderParams->uViewportZ, pBLVRenderParams->uViewportW); - pBspRenderer->field_FA8[0].uFaceID = -1; - pBspRenderer->field_FA8[0].std__vector_0007A8 = -1; - pBspRenderer->std__vector_000FA8 = 1; + pBspRenderer->pSectors[0].uFaceID = -1; + pBspRenderer->pSectors[0].std__vector_0007A8 = -1; + pBspRenderer->pNumSectors = 1; sub_440639(0); } @@ -11524,7 +11524,7 @@ v1 = a1; v2 = 0; - v3 = &pIndoor->pSectors[pBspRenderer->field_FA8[a1].uSectorID]; + v3 = &pIndoor->pSectors[pBspRenderer->pSectors[a1].uSectorID]; if ( pRenderer->pRenderD3D ) { for (uint i = 0; i < v3->uNumNonBSPFaces; ++i) @@ -11562,7 +11562,7 @@ //Log::Warning(L"sub_4406BC(%u, %u)", a1, uFirstNode); v10 = a1; - v12 = &pBspRenderer->field_FA8[a1]; + v12 = &pBspRenderer->pSectors[a1]; while ( 1 ) { v2 = &pIndoor->pSectors[v12->uSectorID]; @@ -16204,7 +16204,7 @@ //----- (0044A56A) -------------------------------------------------------- -void __cdecl sub_44A56A() +void __cdecl Party__CountHirelings() { pParty->field_70A = 0;