comparison Vis.cpp @ 848:ceef50611567

* AI fixed (temporary) * PID_ID, PID_TYPE replaces * >> 7 error in AudioPlayer
author zipi
date Sun, 31 Mar 2013 10:44:43 +0100
parents 0f56abdcce94
children 8fafe3645f36 cb0b3badc7f7
comparison
equal deleted inserted replaced
847:e398541aee60 848:ceef50611567
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;