Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Vis.cpp	Sun Mar 31 16:42:11 2013 +0600
+++ b/Vis.cpp	Sun Mar 31 16:44:01 2013 +0600
@@ -1559,8 +1559,8 @@
     case VisObjectType_Sprite:
     {
       v5 = filter->field_10;
-      int object_idx = (pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid & 0xFFFF) >> 3;
-      int object_type = pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid & 7;
+      int object_idx = PID_ID(pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid);
+      int object_type = PID_TYPE(pBillboardRenderList[pRenderer->pBillboardRenderListD3D[(int)uD3DBillboardIdx_or_pBLVFace_or_pODMFace].uParentBillboardID].object_pid);
       if ( v5 & 2 )
       {
         if (object_type == filter->object_id)