Mercurial > mm7

comparison mm7_1.cpp @ 150:d92c78ab54fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Feb 2013 10:17:35 +0600
parents 77ad59c17864 cca78efb377e
children 9abdd40a107b
comparison
equal deleted inserted replaced
149:2b0c652cc165 150:d92c78ab54fe
4393 v31 = 813; 4393 v31 = 813;
4394 v32 = 814; 4394 v32 = 814;
4395 v5 = rand() % 4; 4395 v5 = rand() % 4;
4396 v6 = dword_5B5920 >> 3; 4396 v6 = dword_5B5920 >> 3;
4397 v35 = v5; 4397 v35 = v5;
4398 if ( (dword_5B5920 & 7) == 5 ) 4398 if ( (dword_5B5920 & 7) == OBJECT_Decoration)
4399 { 4399 {
4400 v16 = v6; 4400 v16 = v6;
4401 v14 = pLevelDecorations[v6].vPosition.x; 4401 v14 = pLevelDecorations[v6].vPosition.x;
4402 v38 = pLevelDecorations[v6].vPosition.y; 4402 v38 = pLevelDecorations[v6].vPosition.y;
4403 v17 = pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight; 4403 v17 = pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight;
4404 v15 = pLevelDecorations[v16].vPosition.z + (((signed int)v17 - HIDWORD(v17)) >> 1); 4404 v15 = pLevelDecorations[v16].vPosition.z + (((signed int)v17 - HIDWORD(v17)) >> 1);
4405 } 4405 }
4406 else 4406 else
4407 { 4407 {
4408 if ( (dword_5B5920 & 7) != 6 ) 4408 if ( (dword_5B5920 & 7) != OBJECT_BModel)
4409 goto LABEL_12; 4409 goto LABEL_12;
4410 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor) 4410 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
4411 { 4411 {
4412 v7 = &pOutdoor->pBModels[dword_5B5920 >> 9].pFaces[(dword_5B5920 >> 3) & 0x3F]; 4412 v7 = &pOutdoor->pBModels[dword_5B5920 >> 9].pFaces[(dword_5B5920 >> 3) & 0x3F];
4413 v8 = v7->pBoundingBox.y1; 4413 v8 = v7->pBoundingBox.y1;
5050 } 5050 }
5051 } 5051 }
5052 uLastPointedObjectID = pMouse->uPointingObjectID; 5052 uLastPointedObjectID = pMouse->uPointingObjectID;
5053 return; 5053 return;
5054 } 5054 }
5055 if ( (v18 & 7) == 6 ) // bmodel 5055 if ( (v18 & 7) == OBJECT_BModel)
5056 { 5056 {
5057 if ( v18 < (signed int)0x2000000u ) 5057 if ( v18 < (signed int)0x2000000u )
5058 { 5058 {
5059 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) 5059 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
5060 { 5060 {
5990 else 5990 else
5991 { 5991 {
5992 v1 = pMouse->GetCursorPos(&a2); 5992 v1 = pMouse->GetCursorPos(&a2);
5993 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]]; 5993 v0 = pRenderer->pActiveZBuffer[v1->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v25)->y]];
5994 } 5994 }
5995 if ( (v0 & 7) == 2 ) 5995 if ( (v0 & 7) == OBJECT_Item)
5996 { 5996 {
5997 a2.y = (signed int)(unsigned __int16)v0 >> 3; 5997 a2.y = (signed int)(unsigned __int16)v0 >> 3;
5998 v21 = (signed int)(unsigned __int16)v0 >> 3; 5998 v21 = (signed int)(unsigned __int16)v0 >> 3;
5999 if ( !(pObjectList->pObjects[pLayingItems[v21].uObjectDescID].uFlags & 0x10) 5999 if ( !(pObjectList->pObjects[pLayingItems[v21].uObjectDescID].uFlags & 0x10)
6000 && a2.y < 1000 6000 && a2.y < 1000
6022 LayingItem::_42F933(a2.y); 6022 LayingItem::_42F933(a2.y);
6023 return; 6023 return;
6024 } 6024 }
6025 goto LABEL_13; 6025 goto LABEL_13;
6026 } 6026 }
6027 if ( (v0 & 7) != 3 ) 6027 if ( (v0 & 7) != OBJECT_Actor)
6028 { 6028 {
6029 if ( (v0 & 7) == 5 ) 6029 if ( (v0 & 7) == OBJECT_Decoration)
6030 { 6030 {
6031 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]; 6031 v13 = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
6032 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 ) 6032 if ( (signed int)(((unsigned int)v0 >> 16) - pDecorationList->pDecorations[v13->uDecorationDescID].uRadius) >= 512 )
6033 goto LABEL_13; 6033 goto LABEL_13;
6034 v14 = v13->field_16_event_id; 6034 v14 = v13->field_16_event_id;
6045 } 6045 }
6046 v11 = v14; 6046 v11 = v14;
6047 } 6047 }
6048 else 6048 else
6049 { 6049 {
6050 if ( (v0 & 7) != 6 || (unsigned int)v0 >= 0x2000000 ) 6050 if ( (v0 & 7) != OBJECT_BModel || (unsigned int)v0 >= 0x2000000 )
6051 goto LABEL_13; 6051 goto LABEL_13;
6052 v2 = (signed int)(unsigned __int16)v0 >> 3; 6052 v2 = (signed int)(unsigned __int16)v0 >> 3;
6053 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor) 6053 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
6054 { 6054 {
6055 v3 = &pIndoor->pFaces[v2]; 6055 v3 = &pIndoor->pFaces[v2];