Mercurial > mm7

changeset 1479:59d1da1863df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename DECORATION_FLAGS to DECORATION_DESC_FLAGS.
author yoctozepto
date Wed, 28 Aug 2013 22:02:03 +0200
parents 251111bac49f
children 61451d5980bf
files AudioPlayer.cpp DecorationList.h Indoor.cpp
diffstat 3 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/AudioPlayer.cpp	Wed Aug 28 18:43:31 2013 +0200
+++ b/AudioPlayer.cpp	Wed Aug 28 22:02:03 2013 +0200
@@ -1681,7 +1681,7 @@
     auto decor_desc = &pDecorationList->pDecorations[decor->uDecorationDescID];
       //v48 = &pDecorationList->pDecorations[decor->uDecorationDescID];
       //v49 = v48->uFlags;
-      uNumRepeats = (~(unsigned __int8)decor_desc->uFlags & DECORATION_SLOW_LOOP) >> 6;
+      uNumRepeats = (~(unsigned __int8)decor_desc->uFlags & DECORATION_DESC_SLOW_LOOP) >> 6;
  
     if (decor_desc->SoundOnDawn() || decor_desc->SoundOnDusk())
     {
--- a/DecorationList.h	Wed Aug 28 18:43:31 2013 +0200
+++ b/DecorationList.h	Wed Aug 28 22:02:03 2013 +0200
@@ -4,19 +4,19 @@
 
 
 /*  321 */
-enum DECORATION_FLAGS
+enum DECORATION_DESC_FLAGS
 {
-  DECORATION_MOVE_THROUGH = 0x1,
-  DECORATION_DONT_DRAW = 0x2,
-  DECORATION_FLICKER_SLOW = 0x4,
-  DECORATION_FICKER_AVERAGE = 0x8,
-  DECORATION_FICKER_FAST = 0x10,
-  DECORATION_MARKER = 0x20,
-  DECORATION_SLOW_LOOP = 0x40,
-  DECORATION_EMITS_FIRE = 0x80,
-  DECORATION_SOUND_ON_DAWN = 0x100,
-  DECORATION_SOUND_ON_DUSK = 0x200,
-  DECORATION_EMITS_SMOKE = 0x400,
+  DECORATION_DESC_MOVE_THROUGH = 0x0001,
+  DECORATION_DESC_DONT_DRAW = 0x0002,
+  DECORATION_DESC_FLICKER_SLOW = 0x0004,
+  DECORATION_DESC_FICKER_AVERAGE = 0x0008,
+  DECORATION_DESC_FICKER_FAST = 0x0010,
+  DECORATION_DESC_MARKER = 0x0020,
+  DECORATION_DESC_SLOW_LOOP = 0x0040,
+  DECORATION_DESC_EMITS_FIRE = 0x0080,
+  DECORATION_DESC_SOUND_ON_DAWN = 0x0100,
+  DECORATION_DESC_SOUND_ON_DUSK = 0x0200,
+  DECORATION_DESC_EMITS_SMOKE = 0x0400,
 };
 
 
@@ -25,10 +25,10 @@
 #pragma pack(push, 1)
 struct DecorationDesc_mm6
 {
-  inline bool CanMoveThrough() {return (uFlags & DECORATION_MOVE_THROUGH) != 0;}
-  inline bool DontDraw()       {return (uFlags & DECORATION_DONT_DRAW) != 0;} 
-  inline bool SoundOnDawn()    {return (uFlags & DECORATION_SOUND_ON_DAWN) != 0;}
-  inline bool SoundOnDusk()    {return (uFlags & DECORATION_SOUND_ON_DUSK) != 0;}
+  inline bool CanMoveThrough() {return (uFlags & DECORATION_DESC_MOVE_THROUGH) != 0;}
+  inline bool DontDraw()       {return (uFlags & DECORATION_DESC_DONT_DRAW) != 0;} 
+  inline bool SoundOnDawn()    {return (uFlags & DECORATION_DESC_SOUND_ON_DAWN) != 0;}
+  inline bool SoundOnDusk()    {return (uFlags & DECORATION_DESC_SOUND_ON_DUSK) != 0;}
 
   char pName[32];
   char field_20[32];
--- a/Indoor.cpp	Wed Aug 28 18:43:31 2013 +0200
+++ b/Indoor.cpp	Wed Aug 28 22:02:03 2013 +0200
@@ -4989,7 +4989,7 @@
 
     v3 = &pDecorationList->pDecorations[v2->uDecorationDescID];
     v4 = v3->uFlags;
-    if (v3->uFlags & DECORATION_EMITS_FIRE)
+    if (v3->uFlags & DECORATION_DESC_EMITS_FIRE)
     {
       memset(&local_0, 0, 0x68u);               // fire,  like at the Pit's tavern
       v5 = (double)v2->vPosition.x;
@@ -5009,7 +5009,7 @@
     }
 
 
-      if (v4 & DECORATION_DONT_DRAW)
+      if (v4 & DECORATION_DESC_DONT_DRAW)
         return;
 
         v6 = v2->vPosition.x;