Mercurial > mm7

comparison Vis.cpp @ 855:cb0b3badc7f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 31 Mar 2013 16:44:01 +0600
parents 06fc66ceecd6 ceef50611567
children e4bd2a0bf08b
comparison
equal deleted inserted replaced
854:06fc66ceecd6 855:cb0b3badc7f7
1557 return true; 1557 return true;
1558 1558
1559 case VisObjectType_Sprite: 1559 case VisObjectType_Sprite:
1560 { 1560 {
1561 v5 = filter->field_10; 1561 v5 = filter->field_10;
1562 int object_idx = (pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid & 0xFFFF) >> 3; 1562 int object_idx = PID_ID(pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid);
1563 int object_type = pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid & 7; 1563 int object_type = PID_TYPE(pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid);
1564 if ( v5 & 2 ) 1564 if ( v5 & 2 )
1565 { 1565 {
1566 if (object_type == filter->object_id) 1566 if (object_type == filter->object_id)
1567 return false; 1567 return false;
1568 return true; 1568 return true;