@@ -49,7 +49,6 @@ enum MotionMasterFlags : uint8
4949 MOTIONMASTER_FLAG_STATIC_INITIALIZATION_PENDING = 0x2 , // Static movement (MOTION_SLOT_DEFAULT) hasn't been initialized
5050 MOTIONMASTER_FLAG_INITIALIZATION_PENDING = 0x4 , // MotionMaster is stalled until signaled
5151 MOTIONMASTER_FLAG_INITIALIZING = 0x8 , // MotionMaster is initializing
52- MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION = 0x10 ,
5352
5453 MOTIONMASTER_FLAG_DELAYED = MOTIONMASTER_FLAG_UPDATE | MOTIONMASTER_FLAG_INITIALIZATION_PENDING
5554};
@@ -195,15 +194,15 @@ class TC_GAME_API MotionMaster
195194 void MoveFormation (Unit* leader, float range, float angle, uint32 point1, uint32 point2);
196195
197196 void LaunchMoveSpline (std::function<void (Movement::MoveSplineInit& init)>&& initializer, uint32 id = 0, MovementGeneratorPriority priority = MOTION_PRIORITY_NORMAL, MovementGeneratorType type = EFFECT_MOTION_TYPE);
198-
199- void AddFlag (uint8 const flag) { _flags |= flag; }
200- bool HasFlag (uint8 const flag) const { return (_flags & flag) != 0 ; }
201- void RemoveFlag (uint8 const flag) { _flags &= ~flag; }
202197 private:
203198 typedef std::unique_ptr<MovementGenerator, MovementGeneratorDeleter> MovementGeneratorPointer;
204199 typedef std::multiset<MovementGenerator*, MovementGeneratorComparator> MotionMasterContainer;
205200 typedef std::unordered_multimap<uint32, MovementGenerator const *> MotionMasterUnitStatesContainer;
206201
202+ void AddFlag (uint8 const flag) { _flags |= flag; }
203+ bool HasFlag (uint8 const flag) const { return (_flags & flag) != 0 ; }
204+ void RemoveFlag (uint8 const flag) { _flags &= ~flag; }
205+
207206 void ResolveDelayedActions ();
208207 void Remove (MotionMasterContainer::iterator iterator, bool active, bool movementInform);
209208 void Pop (bool active, bool movementInform);
0 commit comments