Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
871:710cf848ad24 872:2db21a810d48
1079 else 1079 else
1080 { 1080 {
1081 v1 = pMouse->GetCursorPos(&a2); 1081 v1 = pMouse->GetCursorPos(&a2);
1082 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]]; 1082 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]];
1083 } 1083 }
1084 if ( (v0 & 7) == OBJECT_Item) 1084 if ( PID_TYPE(v0) == OBJECT_Item)
1085 { 1085 {
1086 a2.y = (signed int)(unsigned __int16)v0 >> 3; 1086 a2.y = (signed int)(unsigned __int16)v0 >> 3;
1087 v21 = (signed int)(unsigned __int16)v0 >> 3; 1087 v21 = (signed int)(unsigned __int16)v0 >> 3;
1088 if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10) 1088 if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10)
1089 && a2.y < 1000 1089 && a2.y < 1000
1114 v4 = pParty->pPickedItem.uItemID; 1114 v4 = pParty->pPickedItem.uItemID;
1115 if ( !pParty->pPickedItem.uItemID ) 1115 if ( !pParty->pPickedItem.uItemID )
1116 return; 1116 return;
1117 goto LABEL_14; 1117 goto LABEL_14;
1118 } 1118 }
1119 if ( (v0 & 7) != OBJECT_Actor) 1119 if ( PID_TYPE(v0) != OBJECT_Actor)
1120 { 1120 {
1121 if ( (v0 & 7) == OBJECT_Decoration) 1121 if ( PID_TYPE(v0) == OBJECT_Decoration)
1122 { 1122 {
1123 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]; 1123 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
1124 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 ) 1124 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 )
1125 { 1125 {
1126 v4 = pParty->pPickedItem.uItemID; 1126 v4 = pParty->pPickedItem.uItemID;
1142 } 1142 }
1143 v11 = v14; 1143 v11 = v14;
1144 } 1144 }
1145 else 1145 else
1146 { 1146 {
1147 if ( (v0 & 7) != OBJECT_BModel || (signed)v0 >= 0x2000000 ) 1147 if ( PID_TYPE(v0) != OBJECT_BModel || (signed)v0 >= 0x2000000 )
1148 { 1148 {
1149 v4 = pParty->pPickedItem.uItemID; 1149 v4 = pParty->pPickedItem.uItemID;
1150 if ( !pParty->pPickedItem.uItemID ) 1150 if ( !pParty->pPickedItem.uItemID )
1151 return; 1151 return;
1152 goto LABEL_14; 1152 goto LABEL_14;