Mercurial > mm7

comparison mm7_1.cpp @ 848:ceef50611567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* AI fixed (temporary) * PID_ID, PID_TYPE replaces * >> 7 error in AudioPlayer
author zipi
date Sun, 31 Mar 2013 10:44:43 +0100
parents dfd683c4f538
children 2db21a810d48
comparison
equal deleted inserted replaced
847:e398541aee60 848:ceef50611567
1074 else 1074 else
1075 { 1075 {
1076 v1 = pMouse->GetCursorPos(&a2); 1076 v1 = pMouse->GetCursorPos(&a2);
1077 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]]; 1077 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]];
1078 } 1078 }
1079 if ( (v0 & 7) == OBJECT_Item) 1079 if ( PID_TYPE(v0) == OBJECT_Item)
1080 { 1080 {
1081 a2.y = (signed int)(unsigned __int16)v0 >> 3; 1081 a2.y = (signed int)(unsigned __int16)v0 >> 3;
1082 v21 = (signed int)(unsigned __int16)v0 >> 3; 1082 v21 = (signed int)(unsigned __int16)v0 >> 3;
1083 if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10) 1083 if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10)
1084 && a2.y < 1000 1084 && a2.y < 1000
1109 v4 = pParty->pPickedItem.uItemID; 1109 v4 = pParty->pPickedItem.uItemID;
1110 if ( !pParty->pPickedItem.uItemID ) 1110 if ( !pParty->pPickedItem.uItemID )
1111 return; 1111 return;
1112 goto LABEL_14; 1112 goto LABEL_14;
1113 } 1113 }
1114 if ( (v0 & 7) != OBJECT_Actor) 1114 if ( PID_TYPE(v0) != OBJECT_Actor)
1115 { 1115 {
1116 if ( (v0 & 7) == OBJECT_Decoration) 1116 if ( PID_TYPE(v0) == OBJECT_Decoration)
1117 { 1117 {
1118 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]; 1118 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
1119 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 ) 1119 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 )
1120 { 1120 {
1121 v4 = pParty->pPickedItem.uItemID; 1121 v4 = pParty->pPickedItem.uItemID;
1137 } 1137 }
1138 v11 = v14; 1138 v11 = v14;
1139 } 1139 }
1140 else 1140 else
1141 { 1141 {
1142 if ( (v0 & 7) != OBJECT_BModel || (signed)v0 >= 0x2000000 ) 1142 if ( PID_TYPE(v0) != OBJECT_BModel || (signed)v0 >= 0x2000000 )
1143 { 1143 {
1144 v4 = pParty->pPickedItem.uItemID; 1144 v4 = pParty->pPickedItem.uItemID;
1145 if ( !pParty->pPickedItem.uItemID ) 1145 if ( !pParty->pPickedItem.uItemID )
1146 return; 1146 return;
1147 goto LABEL_14; 1147 goto LABEL_14;