comparison mm7_3.cpp @ 741:cd9ae9a2c99c

Слияние
author Ritor1
date Fri, 22 Mar 2013 19:59:03 +0600
parents 7378398c34e4 2f4e33c1ed24
children 23a07ead5980 2f40f4b35ce0
comparison
equal deleted inserted replaced
740:14cf77af15de 741:cd9ae9a2c99c
4867 v31->std__vector_000004_size = 0; 4867 v31->std__vector_000004_size = 0;
4868 LOBYTE(v31) = 0; 4868 LOBYTE(v31) = 0;
4869 if ( stru_F8AD28.uNumLightsApplied > 0 || pDecalBuilder->uNumDecals > 0 ) 4869 if ( stru_F8AD28.uNumLightsApplied > 0 || pDecalBuilder->uNumDecals > 0 )
4870 { 4870 {
4871 v31 = (LightmapBuilder *)(v50 ? 3 : v49 != 0 ? 5 : 0); 4871 v31 = (LightmapBuilder *)(v50 ? 3 : v49 != 0 ? 5 : 0);
4872 static_RenderBuildingsD3D_stru_73C834._49B04D(pFace, (BSPVertexBuffer *)v56 - 1); 4872 static_RenderBuildingsD3D_stru_73C834.GetFacePlaneAndClassify(pFace, (BSPVertexBuffer *)v56 - 1);
4873 if ( pDecalBuilder->uNumDecals > 0 ) 4873 if ( pDecalBuilder->uNumDecals > 0 )
4874 { 4874 {
4875 v40 = -1; 4875 v40 = -1;
4876 v39 = v31; 4876 v39 = v31;
4877 v38 = 0; 4877 v38 = 0;
5240 else 5240 else
5241 { 5241 {
5242 v35 = (BSPVertexBuffer *)(v78 - 2); 5242 v35 = (BSPVertexBuffer *)(v78 - 2);
5243 v12->field_108 = 1; 5243 v12->field_108 = 1;
5244 5244
5245 static_sub_004789DE_stru_73C818._49B04D((ODMFace *)v3, v35); 5245 static_sub_004789DE_stru_73C818.GetFacePlaneAndClassify((ODMFace *)v3, v35);
5246 v55 = static_sub_004789DE_stru_73C818.face_plane.vNormal.x; 5246 v55 = static_sub_004789DE_stru_73C818.face_plane.vNormal.x;
5247 v56 = static_sub_004789DE_stru_73C818.face_plane.vNormal.y; 5247 v56 = static_sub_004789DE_stru_73C818.face_plane.vNormal.y;
5248 v57 = static_sub_004789DE_stru_73C818.face_plane.vNormal.z; 5248 v57 = static_sub_004789DE_stru_73C818.face_plane.vNormal.z;
5249 pGame->pLightmapBuilder->_45CA88(&stru_F8AD28, array_50AC10, v26, (Vec3_float_ *)&v55); 5249 pGame->pLightmapBuilder->_45CA88(&stru_F8AD28, array_50AC10, v26, (Vec3_float_ *)&v55);
5250 } 5250 }