Mercurial > mm7

comparison mm7_2.cpp @ 1137:62c759bc49f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Sat, 01 Jun 2013 10:32:08 +0600
parents a19cdcaa36fe
children f947bedb2859
comparison
equal deleted inserted replaced
1136:3dc32954f1c7 1137:62c759bc49f7
10523 10523
10524 case OBJECT_BModel: 10524 case OBJECT_BModel:
10525 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor ) 10525 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor )
10526 { 10526 {
10527 int bmodel_id = a1 >> 9, 10527 int bmodel_id = a1 >> 9,
10528 face_id = PID_ID(a1) &0x3F; 10528 face_id = PID_ID(a1) & 0x3F;
10529 if (bmodel_id >= pOutdoor->uNumBModels) 10529 if (bmodel_id >= pOutdoor->uNumBModels)
10530 return 1; 10530 return 1;
10531 auto face = &pOutdoor->pBModels[bmodel_id].pFaces[face_id]; 10531 auto face = &pOutdoor->pBModels[bmodel_id].pFaces[face_id];
10532 if (face->uAttributes & 0x100000 || (v6 = face->sCogTriggeredID) == 0 ) 10532 if (face->uAttributes & 0x100000 || face->sCogTriggeredID == 0 )
10533 return 1; 10533 return 1;
10534 EventProcessor((signed __int16)v6, v2, 1); 10534 EventProcessor((signed __int16)face->sCogTriggeredID, v2, 1);
10535 } 10535 }
10536 else 10536 else
10537 { 10537 {
10538 v4 = &pIndoor->pFaces[PID_ID(a1)]; 10538 v4 = &pIndoor->pFaces[PID_ID(a1)];
10539 v5 = v4->uAttributes; 10539 v5 = v4->uAttributes;