--- a/UI/UiGame.cpp	Thu Dec 12 09:28:05 2013 +0600
+++ b/UI/UiGame.cpp	Thu Dec 12 13:55:42 2013 +0600
@@ -1152,7 +1152,6 @@
   signed int v18; // eax@55
   signed int v18b;
   signed int v19; // ecx@63
-  BLVFace *pFace; // eax@69
   const char *pText; // ecx@79
   char *v28; // esi@82
   enum UIMessageType pMessageType2; // esi@110
@@ -1260,7 +1259,7 @@
       {
         if ( HIWORD(v18) < interaction_distance_limit )
         {
-          if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
+          if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
           {
             v18b = (signed int)(unsigned __int16)v18 >> 9;
             if ( !pOutdoor->pBModels[v18b].pFaces[v19 & 0x3F].sCogTriggeredID
@@ -1284,29 +1283,31 @@
             uLastPointedObjectID = pMouse->uPointingObjectID;
             return;
           }
-          pFace = &pIndoor->pFaces[v19];
-          if ( BYTE3(pFace->uAttributes) & 6 )
+          if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
           {
-            if ( !pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID
-              || !GetEventHintString(pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID) )
+            if ( pIndoor->pFaces[v19].uAttributes & FACE_INDICATE )
             {
-              pMouse->uPointingObjectID = 0;
-              pFooterString[0] = 0;
-              bForceDrawFooter = 1;
-              uLastPointedObjectID = 0;
+              if ( !pIndoor->pFaceExtras[pIndoor->pFaces[v19].uFaceExtraID].uEventID
+               || !GetEventHintString(pIndoor->pFaceExtras[pIndoor->pFaces[v19].uFaceExtraID].uEventID) )
+              {
+                pMouse->uPointingObjectID = 0;
+                pFooterString[0] = 0;
+                bForceDrawFooter = 1;
+                uLastPointedObjectID = 0;
+                return;
+              }
+              GameUI_SetFooterString(GetEventHintString(pIndoor->pFaceExtras[pIndoor->pFaces[v19].uFaceExtraID].uEventID));
+              if ( pMouse->uPointingObjectID == 0 )
+              {
+                if ( uLastPointedObjectID != 0 )
+                {
+                  pFooterString[0] = 0;
+                  bForceDrawFooter = 1;
+                }
+              }
+              uLastPointedObjectID = pMouse->uPointingObjectID;
               return;
             }
-            GameUI_SetFooterString(GetEventHintString(pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID));
-            if ( pMouse->uPointingObjectID == 0 )
-            {
-              if ( uLastPointedObjectID != 0 )
-              {
-                pFooterString[0] = 0;
-                bForceDrawFooter = 1;
-              }
-            }
-            uLastPointedObjectID = pMouse->uPointingObjectID;
-            return;
           }
         }
         pMouse->uPointingObjectID = 0;
@@ -1973,7 +1974,7 @@
 LABEL_15:
       //v12 = &pIndoor->pFaces[pOutline->uFace1ID];
       if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
-          (pFace1->uAttributes & 0x2000 || pFace2->uAttributes & 0x2000) &&
+          (pFace1->Invisible() || pFace2->Invisible()) &&
           (pIndoor->pFaceExtras[pFace1->uFaceExtraID].uEventID || pIndoor->pFaceExtras[pFace2->uFaceExtraID].uEventID))
       {
         if (uNumBlueFacesInBLVMinimap < 49)