Mercurial > mm7

comparison Indoor.cpp @ 1930:df4e27f2a541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Wed, 23 Oct 2013 19:13:07 -0700
parents f92e0bab7c78
children 431d3da6e945
comparison
equal deleted inserted replaced
1929:4cce1e24b7e7 1930:df4e27f2a541
559 stru_F7B60C.face_plane.vNormal.y = pFace->pFacePlane.vNormal.y; 559 stru_F7B60C.face_plane.vNormal.y = pFace->pFacePlane.vNormal.y;
560 stru_F7B60C.face_plane.vNormal.z = pFace->pFacePlane.vNormal.z; 560 stru_F7B60C.face_plane.vNormal.z = pFace->pFacePlane.vNormal.z;
561 stru_F7B60C.face_plane.dist = pFace->pFacePlane.dist; 561 stru_F7B60C.face_plane.dist = pFace->pFacePlane.dist;
562 } 562 }
563 563
564 if (stru_F8AD28.uNumLightsApplied > 0 && !(pFace->uAttributes & FACE_DO_NOT_LIGHT)) 564 if (stru_F8AD28.uNumLightsApplied > 0 && !(pFace->uAttributes & FACE_INDOOR_SKY))
565 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0); 565 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0);
566 566
567 if (pDecalBuilder->uNumDecals > 0) 567 if (pDecalBuilder->uNumDecals > 0)
568 pDecalBuilder->ApplyDecals(a4a, 1, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0, pFace->uSectorID); 568 pDecalBuilder->ApplyDecals(a4a, 1, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0, pFace->uSectorID);
569 569
599 v17 = 0xFF808080; 599 v17 = 0xFF808080;
600 v23 = pFace->uBitmapID; 600 v23 = pFace->uBitmapID;
601 v27 = pBitmaps_LOD->pHardwareTextures[v23]; 601 v27 = pBitmaps_LOD->pHardwareTextures[v23];
602 } 602 }
603 603
604 if (pFace->uAttributes & FACE_DO_NOT_LIGHT) 604 if (pFace->uAttributes & FACE_INDOOR_SKY)
605 pRenderer->DrawIndoorPolygonNoLight(uNumVerticesa, uFaceID); 605 pRenderer->DrawIndoorSky(uNumVerticesa, uFaceID);
606 else 606 else
607 pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, PID(OBJECT_BModel, uFaceID), v17, 0); 607 pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, PID(OBJECT_BModel, uFaceID), v17, 0);
608 return; 608 return;
609 } 609 }
610 } 610 }