comparison 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
comparison
equal deleted inserted replaced
2165:47ac9e87690c 2166:00bd098f6435
414 if ( !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].Invisible() 414 if ( !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].Invisible()
415 || (pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].Invisible()) )) 415 || (pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].Invisible()) ))
416 { 416 {
417 if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) ) 417 if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) )
418 { 418 {
419 if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) 419 if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4)
420 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) )) 420 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) ))
421 { 421 {
422 pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1; 422 pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1;
423 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); 423 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8);
424 } 424 }
425 } 425 }
426 if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) 426 if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1)
427 && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & 0x80) 427 && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4)
428 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & 0x80) )) 428 && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) ))
429 || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) 429 || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1)
430 { 430 {
431 v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX); 431 v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX);
432 screenHeight = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].y - pCenterY; 432 screenHeight = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].y - pCenterY;
433 v20 = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex2ID].y - pCenterY; 433 v20 = pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex2ID].y - pCenterY;
685 { 685 {
686 for( int j = 0; j < pOutdoor->pBModels[i].uNumFaces; j++ ) 686 for( int j = 0; j < pOutdoor->pBModels[i].uNumFaces; j++ )
687 { 687 {
688 if ( pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID ) 688 if ( pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID )
689 { 689 {
690 if ( !(pOutdoor->pBModels[i].pFaces[j].uAttributes & 0x100000) ) 690 if ( !(pOutdoor->pBModels[i].pFaces[j].uAttributes & FACE_UNKNOW) )
691 { 691 {
692 if ( GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID) ) 692 if ( GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID) )
693 { 693 {
694 if ( _stricmp(GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID), "") ) 694 if ( _stricmp(GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID), "") )
695 result = GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID); 695 result = GetEventHintString(pOutdoor->pBModels[i].pFaces[j].sCogTriggeredID);