Skip to content

Commit 858f8c1

Browse files
committed
Revert "Core/Movement: implement MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION in MotionMaster + allow public flag access"
This reverts commit 825c88e.
1 parent 7c006ed commit 858f8c1

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

src/server/game/Movement/MotionMaster.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,7 @@ void MotionMaster::Update(uint32 diff)
304304
if (HasFlag(MOTIONMASTER_FLAG_STATIC_INITIALIZATION_PENDING) && IsStatic(top))
305305
{
306306
RemoveFlag(MOTIONMASTER_FLAG_STATIC_INITIALIZATION_PENDING);
307-
if (!HasFlag(MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION))
308-
top->Initialize(_owner);
309-
else
310-
RemoveFlag(MOTIONMASTER_FLAG_STATIC_PREVENT_INITIALIZATION);
307+
top->Initialize(_owner);
311308
}
312309
if (top->HasFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING))
313310
top->Initialize(_owner);

src/server/game/Movement/MotionMaster.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)