Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/GUI/UI/UiGame.cpp	Thu Sep 25 10:40:16 2014 +0600
+++ b/GUI/UI/UiGame.cpp	Thu Oct 02 11:52:31 2014 +0600
@@ -1848,7 +1848,8 @@
         {
           if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
              (pIndoor->pFaces[pOutline->uFace1ID].Clickable() || pIndoor->pFaces[pOutline->uFace2ID].Clickable()) &&
-             (pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace1ID].uFaceExtraID].uEventID || pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace2ID].uFaceExtraID].uEventID))
+             (pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace1ID].uFaceExtraID].uEventID
+		   || pIndoor->pFaceExtras[pIndoor->pFaces[pOutline->uFace2ID].uFaceExtraID].uEventID))
           {
             if (uNumBlueFacesInBLVMinimap < 49)
               pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i;
@@ -1866,7 +1867,8 @@
           }
           continue;
         }
-        if (pIndoor->pFaces[pOutline->uFace1ID].uAttributes & FACE_UNKNOW4 || pIndoor->pFaces[pOutline->uFace2ID].uAttributes & FACE_UNKNOW4)
+        if (pIndoor->pFaces[pOutline->uFace1ID].uAttributes & FACE_UNKNOW7 
+		 || pIndoor->pFaces[pOutline->uFace2ID].uAttributes & FACE_UNKNOW7)
         {
           pOutline->uFlags = pOutline->uFlags | 1;
           pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8);
@@ -1909,19 +1911,19 @@
   unsigned int rotate = pParty->sRotationY & stru_5C6E00->uDoublePiMask;
   if ( (signed int)rotate <= 1920 )
     arrow_idx = 6;
-  if ( (signed int)rotate < 1664 )
+  else if ( (signed int)rotate < 1664 )
     arrow_idx = 5;
-  if ( (signed int)rotate <= 1408 )
+  else if ( (signed int)rotate <= 1408 )
     arrow_idx = 4;
-  if ( (signed int)rotate < 1152 )
+  else if ( (signed int)rotate < 1152 )
     arrow_idx = 3;
-  if ( (signed int)rotate <= 896 )
+  else if ( (signed int)rotate <= 896 )
     arrow_idx = 2;
-  if ( (signed int)rotate < 640 )
+  else if ( (signed int)rotate < 640 )
     arrow_idx = 1;
-  if ( (signed int)rotate <= 384 )
+  else if ( (signed int)rotate <= 384 )
     arrow_idx = 0;
-  if ( (signed int)rotate < 128 || (signed int)rotate > 1920 )
+  else if ( (signed int)rotate < 128 || (signed int)rotate > 1920 )
     arrow_idx = 7;
   pRenderer->DrawTextureTransparent(uCenterX - 3, uCenterY - 3, pIcons_LOD->GetTexture(pTextureIDs_pMapDirs[arrow_idx]));//стрелка