Mercurial > mm7

diff mm7_1.cpp @ 872:2db21a810d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 01 Apr 2013 13:39:39 +0200
parents 710cf848ad24 ceef50611567
children 10fa7dad1391
line wrap: on
line diff
--- a/mm7_1.cpp	Mon Apr 01 13:39:19 2013 +0200
+++ b/mm7_1.cpp	Mon Apr 01 13:39:39 2013 +0200
@@ -1081,7 +1081,7 @@
     v1 = pMouse->GetCursorPos(&a2);
     v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]];
   }
-  if ( (v0 & 7) == OBJECT_Item)
+  if ( PID_TYPE(v0) == OBJECT_Item)
   {
     a2.y = (signed int)(unsigned __int16)v0 >> 3;
     v21 = (signed int)(unsigned __int16)v0 >> 3;
@@ -1116,9 +1116,9 @@
 		return;
     goto LABEL_14;
   }
-  if ( (v0 & 7) != OBJECT_Actor)
+  if ( PID_TYPE(v0) != OBJECT_Actor)
   {
-    if ( (v0 & 7) == OBJECT_Decoration)
+    if ( PID_TYPE(v0) == OBJECT_Decoration)
     {
       v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
       if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 )
@@ -1144,7 +1144,7 @@
     }
     else
     {
-      if ( (v0 & 7) != OBJECT_BModel || (signed)v0 >= 0x2000000 )
+      if ( PID_TYPE(v0) != OBJECT_BModel || (signed)v0 >= 0x2000000 )
 	  {
           v4 = pParty->pPickedItem.uItemID;
           if ( !pParty->pPickedItem.uItemID )