dmuratshin 9 anni fa
parent
commit
ef39594643
2 ha cambiato i file con 5 aggiunte e 2 eliminazioni
  1. 3 1
      oxygine/src/Actor.h
  2. 2 1
      tools/others/format.bat

+ 3 - 1
oxygine/src/Actor.h

@@ -344,6 +344,7 @@ namespace oxygine
         typedef intrusive_list<spActor> children;
         static void setParent(Actor* actor, Actor* parent);
         static children& getChildren(spActor& actor) { return actor->_children; }
+        static unsigned short& _getFlags(Actor* actor) { return actor->_flags; }
 
         void _onGlobalTouchUpEvent(Event*);
         void _onGlobalTouchMoveEvent(Event*);
@@ -380,7 +381,8 @@ namespace oxygine
             flag_touchChildrenEnabled   = 1 << 6,
             flag_cull                   = 1 << 7,
             flag_fastTransform          = 1 << 8,
-            flag_last                   = flag_fastTransform
+            flag_reserved               = 1 << 9,
+            flag_last                   = flag_reserved
         };
 
         mutable unsigned short _flags;

+ 2 - 1
tools/others/format.bat

@@ -20,4 +20,5 @@ set astyle=d:\dropbox\tools\AStyle.exe
 %astyle% d:\oxygine-facebook\example\*.cpp d:\oxygine-facebook\example\*.h %options%
 %astyle% d:\oxygine-facebook\src\*.cpp d:\oxygine-facebook\src\*.h %options%
 
-%astyle% d:\oxygine-editor\editor\src\*.cpp d:\oxygine-editor\editor\src\*.h %options%
+%astyle% d:\oxygine-editor\editor\src\*.cpp d:\oxygine-editor\editor\src\*.h %options%
+%astyle% d:\oxygine-editor\examples\*.cpp d:\oxygine-editor\examples\*.h %options%