Mercurial > mm7

diff Indoor.cpp @ 1489:a27cdb3d753e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of LevelDecoration and related.
author yoctozepto
date Thu, 29 Aug 2013 22:22:33 +0200
parents 59d1da1863df
children 9e9a12506d51
line wrap: on
line diff
--- a/Indoor.cpp	Fri Aug 30 01:49:29 2013 +0600
+++ b/Indoor.cpp	Thu Aug 29 22:22:33 2013 +0200
@@ -2245,7 +2245,7 @@
 
   for (uint i = 0; i < uNumLevelDecorations; ++i)
   {
-    memcpy(&pLevelDecorations[i].field_2, pData, 2);
+    memcpy(&pLevelDecorations[i].uFlags, pData, 2);
     pData += 2;
   }
 
@@ -3868,7 +3868,7 @@
         _6807B8_level_decorations_ids[v16] = i;
     }
 
-    if ( !(pDecortaion->field_2 & 0x20) )
+    if (!(pDecortaion->uFlags & LEVEL_DECORATION_INVISIBLE))
     {
       v17 = &pDecorationList->pDecorations[pDecortaion->uDecorationDescID];
       if (!v17->DontDraw())
@@ -3908,7 +3908,7 @@
             v22 = stru_5E4C90._decor_events[v21 + 74 - 75];
             v35 = v21;
             if ( !v22 )
-              pDecortaion->field_2 |= 0x20;
+              pDecortaion->uFlags |= LEVEL_DECORATION_INVISIBLE;
           }
         }
       }
@@ -4984,7 +4984,7 @@
   //v26 = uDecorationID;
   //LODWORD(v31) = uSectorID;
   v2 = &pLevelDecorations[uDecorationID];
-  if (v2->field_2 & 0x20)
+  if (v2->uFlags & LEVEL_DECORATION_INVISIBLE)
     return;
 
     v3 = &pDecorationList->pDecorations[v2->uDecorationDescID];
@@ -6159,7 +6159,7 @@
       if ( v9 )
       {
         EventProcessor(v9, a1, 1);
-        LOBYTE(v8->field_2) |= 8u;
+        v8->uFlags |= LEVEL_DECORATION_VISIBLE_ON_MAP;
       }
       else
       {