Mercurial > mm7
diff UI/Books/UIMapBook.cpp @ 2166:00bd098f6435
fixpoint_mul in different functions and others
| author | Ritor1 |
|---|---|
| date | Fri, 17 Jan 2014 17:58:48 +0600 |
| parents | 0a1438c16c2b |
| children | 5b27c035a241 |
line wrap: on
line diff
--- a/UI/Books/UIMapBook.cpp Thu Jan 16 17:34:48 2014 +0600 +++ b/UI/Books/UIMapBook.cpp Fri Jan 17 17:58:48 2014 +0600 @@ -416,16 +416,16 @@ { if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) ) { - if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) - && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) )) + if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4) + && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) )) { pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1; pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); } } if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) - && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) - && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) )) + && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4) + && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) )) || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) { v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX); @@ -687,7 +687,7 @@ { if ( pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID ) { - if ( !(pOutdoor->pBModels[i].pFaces[j].uAttributes & 0x100000) ) + if ( !(pOutdoor->pBModels[i].pFaces[j].uAttributes & FACE_UNKNOW) ) { if ( GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID) ) {