Mercurial > mm7
diff Engine/Graphics/Indoor.cpp @ 2508:491f0babd563
use_music_folder
author | Ritor1 |
---|---|
date | Thu, 02 Oct 2014 11:52:31 +0600 |
parents | 9b96a51011fb |
children | f6de3e15d4a5 |
line wrap: on
line diff
--- a/Engine/Graphics/Indoor.cpp Thu Sep 25 10:40:16 2014 +0600 +++ b/Engine/Graphics/Indoor.cpp Thu Oct 02 11:52:31 2014 +0600 @@ -424,7 +424,7 @@ return; ++pBLVRenderParams->uNumFacesRenderedThisFrame; - pFace->uAttributes |= FACE_UNKNOW4; + pFace->uAttributes |= FACE_UNKNOW7; if (!pFace->GetTexture()) return; @@ -2948,7 +2948,7 @@ bNoNPCHiring = false; pDest = 1; uCurrentlyLoadedLevelType = LEVEL_Indoor; - pGame->uFlags2 &= 0xFFFFFFF7u; + pGame->uFlags2 &= 0xFFFFFFF7;//~0x00000008 if ( Is_out15odm_underwater() ) { bUnderwater = true; @@ -3833,10 +3833,10 @@ if (pBLVRenderParams->uPartySectorID) { pBspRenderer->nodes[0].uSectorID = pBLVRenderParams->uPartySectorID; - pBspRenderer->nodes[0].uViewportW = pBLVRenderParams->uViewportW; + pBspRenderer->nodes[0].uViewportX = pBLVRenderParams->uViewportX; + pBspRenderer->nodes[0].uViewportY = pBLVRenderParams->uViewportY; pBspRenderer->nodes[0].uViewportZ = pBLVRenderParams->uViewportZ; - pBspRenderer->nodes[0].uViewportY = pBLVRenderParams->uViewportY; - pBspRenderer->nodes[0].uViewportX = pBLVRenderParams->uViewportX; + pBspRenderer->nodes[0].uViewportW = pBLVRenderParams->uViewportW; pBspRenderer->nodes[0].PortalScreenData.GetViewportData(pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY, pBLVRenderParams->uViewportZ, pBLVRenderParams->uViewportW); pBspRenderer->nodes[0].uFaceID = -1; @@ -4890,7 +4890,7 @@ bool bFound = false; for (uint i = 0; i < pFace->uNumVertices; ++i) { - if ( PortalFace._view_transformed_z[i + 3] >= 524288 )// 8.0(0x80000) + if ( PortalFace._view_transformed_z[i + 3] >= 524288 )// 8.0(0x80000) 0x196A9FF >=0x80000 { bFound = true; break;