Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: implement and use new remove method in MotionMaster

Browse Source 
All erases within MotionMaster are now done by itr.
Previous impl used value erase which uses the custom comparator which does not identify elements uniquely --> wrong values were deleted

ref #23187#discussion_r275791179
This commit is contained in:
ccrs
2019-04-16 23:29:04 +02:00
parent 8e286f91b9
commit 11de6b5f86
2 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/server/game/Movement/MotionMaster.cpp
View File

@@ -363,12 +363,7 @@ void MotionMaster::Remove(MovementGenerator* movement, MovementSlot slot/* = MOT
{
auto itr = _generators.find(movement);
if (itr != _generators.end())
{
MovementGenerator* pointer = *itr;
bool const top = GetCurrentMovementGenerator() == pointer;
_generators.erase(pointer);
Delete(pointer, top, false);
}
Remove(itr, GetCurrentMovementGenerator() == *itr, false);
}
break;
default:
@@ -409,12 +404,7 @@ void MotionMaster::Remove(MovementGeneratorType type, MovementSlot slot/* = MOTI
});
if (itr != _generators.end())
{
MovementGenerator* pointer = *itr;
bool const top = GetCurrentMovementGenerator() == pointer;
_generators.erase(pointer);
Delete(pointer, top, false);
}
Remove(itr, GetCurrentMovementGenerator() == *itr, false);
}
break;
default:
@@ -1024,11 +1014,16 @@ void MotionMaster::LaunchMoveSpline(Movement::MoveSplineInit&& init, uint32 id/*
/******************** Private methods ********************/
void MotionMaster::Remove(MotionMasterContainer::iterator iterator, bool active, bool movementInform)
{
MovementGenerator* pointer = *iterator;
_generators.erase(iterator);
Delete(pointer, active, movementInform);
}
void MotionMaster::Pop(bool active, bool movementInform)
{
MovementGenerator* pointer = *_generators.begin();
_generators.erase(pointer);
Delete(pointer, active, movementInform);
Remove(_generators.begin(), active, movementInform);
}
void MotionMaster::DirectInitialize()
@@ -1125,14 +1120,11 @@ void MotionMaster::DirectAdd(MovementGenerator* movement, MovementSlot slot/* =
{
if (movement->Priority >= (*_generators.begin())->Priority)
{
MovementGenerator* pointer = *_generators.begin();
if (movement->Priority == pointer->Priority)
{
_generators.erase(pointer);
Delete(pointer, true, false);
}
auto itr = _generators.begin();
if (movement->Priority == (*itr)->Priority)
Remove(itr, true, false);
else
pointer->Deactivate(_owner);
(*itr)->Deactivate(_owner);
}
else
{
@@ -1142,11 +1134,7 @@ void MotionMaster::DirectAdd(MovementGenerator* movement, MovementSlot slot/* =
});
if (itr != _generators.end())
{
MovementGenerator* pointer = *itr;
_generators.erase(pointer);
Delete(pointer, false, false);
}
Remove(itr, false, false);
}
}
else

3
src/server/game/Movement/MotionMaster.h
View File

@@ -122,7 +122,7 @@ class TC_GAME_API MotionMaster
// Removes first found movement
// NOTE: MOTION_SLOT_DEFAULT will be autofilled with IDLE_MOTION_TYPE
void Remove(MovementGeneratorType type, MovementSlot slot = MOTION_SLOT_ACTIVE);
// NOTE: NOTE: MOTION_SLOT_DEFAULT wont be affected
// NOTE: MOTION_SLOT_DEFAULT wont be affected
void Clear();
// Removes all movements for the given MovementSlot
// NOTE: MOTION_SLOT_DEFAULT will be autofilled with IDLE_MOTION_TYPE
@@ -188,6 +188,7 @@ class TC_GAME_API MotionMaster
bool HasFlag(uint8 const flag) const { return (_flags & flag) != 0; }
void RemoveFlag(uint8 const flag) { _flags &= ~flag; }
void Remove(MotionMasterContainer::iterator iterator, bool active, bool movementInform);
void Pop(bool active, bool movementInform);
void DirectInitialize();
void DirectClear();