refactored CONTENTS_DETAIL macro

[xonotic/netradiant.git] / radiant / brush.h

diff --git a/radiant/brush.h b/radiant/brush.h
index ab2029844d32eaa1a9857c9c97b539dc84411261..b4c0f0934d0e7ffccc2f97bfce18cbd744257ce3 100644 (file)
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -65,8 +65,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "winding.h"
 #include "brush_primit.h"
 
 #include "winding.h"
 #include "brush_primit.h"
 

-#define CONTENTS_DETAIL 0x8000000
-
+const unsigned int BRUSH_DETAIL_FLAG = 27;
+const unsigned int BRUSH_DETAIL_MASK = (1 << BRUSH_DETAIL_FLAG);

 
 enum EBrushType
 {
 
 enum EBrushType
 {


@@ -380,15 +380,15 @@ public:
 
 inline void ContentsFlagsValue_assignMasked(ContentsFlagsValue& flags, const ContentsFlagsValue& other)
 {
 
 inline void ContentsFlagsValue_assignMasked(ContentsFlagsValue& flags, const ContentsFlagsValue& other)
 {

-  bool detail = bitfield_enabled(flags.m_contentFlags, CONTENTS_DETAIL);
+  bool detail = bitfield_enabled(flags.m_contentFlags, BRUSH_DETAIL_MASK);

   flags = other;
   if(detail)
   {
   flags = other;
   if(detail)
   {

-    flags.m_contentFlags = bitfield_enable(flags.m_contentFlags, CONTENTS_DETAIL);
+    flags.m_contentFlags = bitfield_enable(flags.m_contentFlags, BRUSH_DETAIL_MASK);

   }
   else
   {
   }
   else
   {

-    flags.m_contentFlags = bitfield_disable(flags.m_contentFlags, CONTENTS_DETAIL);
+    flags.m_contentFlags = bitfield_disable(flags.m_contentFlags, BRUSH_DETAIL_MASK);

   }
 }
 
   }
 }
 


@@ -1416,18 +1416,18 @@ public:
 
   bool isDetail() const
   {
 
   bool isDetail() const
   {

-    return (m_shader.m_flags.m_contentFlags & CONTENTS_DETAIL) != 0;
+    return (m_shader.m_flags.m_contentFlags & BRUSH_DETAIL_MASK) != 0;

   }
   void setDetail(bool detail)
   {
     undoSave();
     if(detail && !isDetail())
     {
   }
   void setDetail(bool detail)
   {
     undoSave();
     if(detail && !isDetail())
     {

-      m_shader.m_flags.m_contentFlags |= CONTENTS_DETAIL;
+      m_shader.m_flags.m_contentFlags |= BRUSH_DETAIL_MASK;

     }
     else if(!detail && isDetail())
     {
     }
     else if(!detail && isDetail())
     {

-      m_shader.m_flags.m_contentFlags &= ~CONTENTS_DETAIL;
+      m_shader.m_flags.m_contentFlags &= ~BRUSH_DETAIL_MASK;

     }
     m_observer->shaderChanged();
   }
     }
     m_observer->shaderChanged();
   }