Mercurial > mm7

comparison UiGame.cpp @ 1066:938af16d5b88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Fri, 24 May 2013 08:17:50 +0400
parents e23a79658fc5
children c40d40027b77
comparison
equal deleted inserted replaced
1065:e86b4951da70 1066:938af16d5b88
2568 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); 2568 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8);
2569 2569
2570 LABEL_15: 2570 LABEL_15:
2571 //v12 = &pIndoor->pFaces[pOutline->uFace1ID]; 2571 //v12 = &pIndoor->pFaces[pOutline->uFace1ID];
2572 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 && 2572 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
2573 (pFace1->uAttributes & 0x2000000 || pFace2->uAttributes & 0x2000000) && 2573 (pFace1->uAttributes & 0x2000 || pFace2->uAttributes & 0x2000) &&
2574 (pIndoor->pFaceExtras[pFace1->uFaceExtraID].uEventID || pIndoor->pFaceExtras[pFace2->uFaceExtraID].uEventID)) 2574 (pIndoor->pFaceExtras[pFace1->uFaceExtraID].uEventID || pIndoor->pFaceExtras[pFace2->uFaceExtraID].uEventID))
2575 { 2575 {
2576 if (uNumBlueFacesInBLVMinimap < 49) 2576 if (uNumBlueFacesInBLVMinimap < 49)
2577 pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i; 2577 pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i;
2578 } 2578 }