Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Movement Cleanups

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/6209ceddb9fbbcf1c7e3552c17b23465c29ec118)
This commit is contained in:
hondacrx
2020-08-24 11:36:57 -04:00
parent 08ef556a36
commit c0d28a8f21
1 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/MotionMaster.cs
+61 -13
View File
@@ -102,21 +102,15 @@ namespace Game.Movement
DirectClean(reset);
}
void ClearExpireList()
void Clear(MovementSlot slot)
{
for (int i = 0; i < _expireList.Count; ++i)
DirectDelete(_expireList[i]);
if (Empty() || slot >= MovementSlot.Max)
return;
_expireList.Clear();
if (Empty())
Initialize();
else if (NeedInitTop())
InitTop();
else if (Convert.ToBoolean(_cleanFlag & MMCleanFlag.Reset))
Top().Reset(_owner);
_cleanFlag &= ~MMCleanFlag.Reset;
if (_cleanFlag.HasAnyFlag(MMCleanFlag.Update))
DelayedClean(slot);
else
DirectClean(slot);
}
public void MovementExpired(bool reset = true)
@@ -149,6 +143,12 @@ namespace Game.Movement
return _slot[(int)slot].GetMovementGeneratorType();
}
public IMovementGenerator GetMotionSlot(MovementSlot slot)
{
Cypher.Assert((int)slot >= 0);
return _slot[(int)slot];
}
public IMovementGenerator GetMotionSlot(int slot)
{
Cypher.Assert(slot >= 0);
@@ -681,6 +681,24 @@ namespace Game.Movement
Top().Reset(_owner);
}
void DirectClean(MovementSlot slot)
{
IMovementGenerator motion = GetMotionSlot(slot);
if (motion != null)
{
_slot[(int)slot] = null;
DirectDelete(motion);
}
while (!Empty() && Top() == null)
--_top;
if (Empty())
Initialize();
else if (NeedInitTop())
InitTop();
}
void DelayedClean()
{
while (Size() > 1)
@@ -692,6 +710,19 @@ namespace Game.Movement
}
}
void DelayedClean(MovementSlot slot)
{
IMovementGenerator motion = GetMotionSlot(slot);
if (motion != null)
{
_slot[(int)slot] = null;
DelayedDelete(motion);
}
while (!Empty() && Top() == null)
--_top;
}
void DirectExpire(bool reset)
{
if (Size() > 1)
@@ -740,6 +771,23 @@ namespace Game.Movement
_expireList.Add(curr);
}
void ClearExpireList()
{
for (int i = 0; i < _expireList.Count; ++i)
DirectDelete(_expireList[i]);
_expireList.Clear();
if (Empty())
Initialize();
else if (NeedInitTop())
InitTop();
else if (_cleanFlag.HasAnyFlag(MMCleanFlag.Reset))
Top().Reset(_owner);
_cleanFlag &= ~MMCleanFlag.Reset;
}
public bool Empty() { return (_top < 0); }
int Size() { return _top + 1; }