Mercurial > mm7

diff Game.cpp @ 2095:577c081b8019

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Thu, 12 Dec 2013 21:44:02 +0600
parents a869b0376b48
children ee2724b9ca05
line wrap: on
line diff
--- a/Game.cpp	Thu Dec 12 21:42:18 2013 +0600
+++ b/Game.cpp	Thu Dec 12 21:44:02 2013 +0600
@@ -2965,7 +2965,7 @@
             if ( uCurrentlyLoadedLevelType != 1 )
             {
               pODMFace = &pOutdoor->pBModels[v44 >> 9].pFaces[v46 & 0x3F];
-              if ( !(pODMFace->uAttributes & 0x02000000) || !pODMFace->sCogTriggeredID )
+              if ( !pODMFace->Clickable() || !pODMFace->sCogTriggeredID )
                 continue;
               v44 = uNumSeconds;
               pSpellInfo = (CastSpellInfo *)pGUIWindow_Settings->ptr_1C;
@@ -2982,7 +2982,7 @@
               continue;
             }
             pBLVFace = &pIndoor->pFaces[v46];
-            if ( !(BYTE3(pBLVFace->uAttributes) & 2) )
+            if ( !pBLVFace->Clickable() )
               continue;
             v48 = pIndoor->pFaceExtras[pBLVFace->uFaceExtraID].uEventID == 0;
           }