Mercurial > mm7

comparison GUI/UI/UiGame.cpp @ 2508:491f0babd563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use_music_folder
author Ritor1
date Thu, 02 Oct 2014 11:52:31 +0600
parents a77c34acdbc9
children 56b6d74ce716
comparison
equal deleted inserted replaced
2507:6dcc6e8dd041 2508:491f0babd563
1846 { 1846 {
1847 if ( pOutline->uFlags & 1 ) 1847 if ( pOutline->uFlags & 1 )
1848 { 1848 {
1849 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 && 1849 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
1850 (pIndoor->pFaces[pOutline->uFace1ID].Clickable() || pIndoor->pFaces[pOutline->uFace2ID].Clickable()) && 1850 (pIndoor->pFaces[pOutline->uFace1ID].Clickable() || pIndoor->pFaces[pOutline->uFace2ID].Clickable()) &&
1851 (pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace1ID].uFaceExtraID].uEventID || pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace2ID].uFaceExtraID].uEventID)) 1851 (pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace1ID].uFaceExtraID].uEventID
1852 || pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace2ID].uFaceExtraID].uEventID))
1852 { 1853 {
1853 if (uNumBlueFacesInBLVMinimap < 49) 1854 if (uNumBlueFacesInBLVMinimap < 49)
1854 pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i; 1855 pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i;
1855 } 1856 }
1856 else 1857 else
1864 v15 = 100; 1865 v15 = 100;
1865 pRenderer->RasterLine2D(pX, pY, pZ, pW, viewparams->pPalette[-v15 + 200]); 1866 pRenderer->RasterLine2D(pX, pY, pZ, pW, viewparams->pPalette[-v15 + 200]);
1866 } 1867 }
1867 continue; 1868 continue;
1868 } 1869 }
1869 if (pIndoor->pFaces[pOutline->uFace1ID].uAttributes & FACE_UNKNOW4 || pIndoor->pFaces[pOutline->uFace2ID].uAttributes & FACE_UNKNOW4) 1870 if (pIndoor->pFaces[pOutline->uFace1ID].uAttributes & FACE_UNKNOW7
1871 || pIndoor->pFaces[pOutline->uFace2ID].uAttributes & FACE_UNKNOW7)
1870 { 1872 {
1871 pOutline->uFlags = pOutline->uFlags | 1; 1873 pOutline->uFlags = pOutline->uFlags | 1;
1872 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); 1874 pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8);
1873 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 && 1875 if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
1874 (pIndoor->pFaces[pOutline->uFace1ID].Clickable() || pIndoor->pFaces[pOutline->uFace2ID].Clickable()) && 1876 (pIndoor->pFaces[pOutline->uFace1ID].Clickable() || pIndoor->pFaces[pOutline->uFace2ID].Clickable()) &&
1907 //draw arrow on the minimap(include. Ritor1) 1909 //draw arrow on the minimap(include. Ritor1)
1908 uint arrow_idx; 1910 uint arrow_idx;
1909 unsigned int rotate = pParty->sRotationY & stru_5C6E00->uDoublePiMask; 1911 unsigned int rotate = pParty->sRotationY & stru_5C6E00->uDoublePiMask;
1910 if ( (signed int)rotate <= 1920 ) 1912 if ( (signed int)rotate <= 1920 )
1911 arrow_idx = 6; 1913 arrow_idx = 6;
1912 if ( (signed int)rotate < 1664 ) 1914 else if ( (signed int)rotate < 1664 )
1913 arrow_idx = 5; 1915 arrow_idx = 5;
1914 if ( (signed int)rotate <= 1408 ) 1916 else if ( (signed int)rotate <= 1408 )
1915 arrow_idx = 4; 1917 arrow_idx = 4;
1916 if ( (signed int)rotate < 1152 ) 1918 else if ( (signed int)rotate < 1152 )
1917 arrow_idx = 3; 1919 arrow_idx = 3;
1918 if ( (signed int)rotate <= 896 ) 1920 else if ( (signed int)rotate <= 896 )
1919 arrow_idx = 2; 1921 arrow_idx = 2;
1920 if ( (signed int)rotate < 640 ) 1922 else if ( (signed int)rotate < 640 )
1921 arrow_idx = 1; 1923 arrow_idx = 1;
1922 if ( (signed int)rotate <= 384 ) 1924 else if ( (signed int)rotate <= 384 )
1923 arrow_idx = 0; 1925 arrow_idx = 0;
1924 if ( (signed int)rotate < 128 || (signed int)rotate > 1920 ) 1926 else if ( (signed int)rotate < 128 || (signed int)rotate > 1920 )
1925 arrow_idx = 7; 1927 arrow_idx = 7;
1926 pRenderer->DrawTextureTransparent(uCenterX - 3, uCenterY - 3, pIcons_LOD->GetTexture(pTextureIDs_pMapDirs[arrow_idx]));//������� 1928 pRenderer->DrawTextureTransparent(uCenterX - 3, uCenterY - 3, pIcons_LOD->GetTexture(pTextureIDs_pMapDirs[arrow_idx]));//�������
1927 1929
1928 //draw objects on the minimap 1930 //draw objects on the minimap
1929 if ( bWizardEyeActive ) 1931 if ( bWizardEyeActive )