Mercurial > mm7

comparison UI/Books/UIMapBook.cpp @ 2092:a869b0376b48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enums and BLV_UpdateDoors()
author Ritor1
date Thu, 12 Dec 2013 13:55:42 +0600
parents 259df09dfb50
children d28d3c006077
comparison
equal deleted inserted replaced
2091:75edfa36c4de 2092:a869b0376b48
413 uNumBlueFacesInBLVMinimap = 0; 413 uNumBlueFacesInBLVMinimap = 0;
414 if ( pIndoor->pMapOutlines->uNumOutlines ) 414 if ( pIndoor->pMapOutlines->uNumOutlines )
415 { 415 {
416 for ( uint i = 0; i < pIndoor->pMapOutlines->uNumOutlines; ++i ) 416 for ( uint i = 0; i < pIndoor->pMapOutlines->uNumOutlines; ++i )
417 { 417 {
418 if ( !(BYTE1(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes) & 0x20 418 if ( !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].Invisible()
419 || (BYTE1(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes) & 0x20) )) 419 || (pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].Invisible()) ))
420 { 420 {
421 if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) ) 421 if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) )
422 { 422 {
423 if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) 423 if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80)
424 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80u) )) 424 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) ))
425 { 425 {
426 pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1; 426 pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1;
427 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); 427 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8);
428 } 428 }
429 } 429 }
430 if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) 430 if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1)
431 && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) 431 && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80)
432 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80u) )) 432 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) ))
433 || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) 433 || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1)
434 { 434 {
435 v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX); 435 v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX);
436 screenHeight = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].y - pCenterY; 436 screenHeight = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].y - pCenterY;
437 v20 = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex2ID].y - pCenterY; 437 v20 = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex2ID].y - pCenterY;