aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorccrs <ccrsdev1992@gmail.com>2016-10-07 14:25:58 +0200
committerccrs <ccrsdev1992@gmail.com>2016-10-07 14:25:58 +0200
commitc2592506adc5683e18e769a918c474c1231a69ce (patch)
tree4fae5ccafa564e8354b79d3eed0d8a886fed11ef /src
parent91d7c1805b3cd492ed28615105f141be3bfff116 (diff)
rerenaming
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp34
-rw-r--r--src/server/game/Movement/MotionMaster.h3
2 files changed, 19 insertions, 18 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index f5090854ad4..105b4245ff3 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -43,7 +43,7 @@ MotionMaster::~MotionMaster()
while (!empty())
{
MovementGenerator *curr = top();
- Pop();
+ pop();
if (curr && !IsStatic(curr))
delete curr; // Skip finalizing on delete, it might launch new movement
}
@@ -55,7 +55,7 @@ void MotionMaster::Initialize()
while (!empty())
{
MovementGenerator *curr = top();
- Pop();
+ pop();
if (curr)
DirectDelete(curr);
}
@@ -692,6 +692,16 @@ void MotionMaster::MoveRotate(uint32 time, RotateDirection direction)
/******************** Private methods ********************/
+void MotionMaster::pop()
+{
+ if (empty())
+ return;
+
+ _slot[_top] = nullptr;
+ while (!empty() && !top())
+ --_top;
+}
+
bool MotionMaster::NeedInitTop() const
{
if (empty())
@@ -705,21 +715,11 @@ void MotionMaster::InitTop()
_initialize[_top] = false;
}
-void MotionMaster::Pop()
-{
- if (empty())
- return;
-
- _slot[_top] = NULL;
- while (!empty() && !top())
- --_top;
-}
-
void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
{
if (MovementGenerator *curr = _slot[slot])
{
- _slot[slot] = NULL; // in case a new one is generated in this slot during directdelete
+ _slot[slot] = nullptr; // in case a new one is generated in this slot during directdelete
if (_top == slot && (_cleanFlag & MMCF_UPDATE))
DelayedDelete(curr);
else
@@ -745,7 +745,7 @@ void MotionMaster::DirectClean(bool reset)
while (size() > 1)
{
MovementGenerator *curr = top();
- Pop();
+ pop();
if (curr) DirectDelete(curr);
}
@@ -763,7 +763,7 @@ void MotionMaster::DelayedClean()
while (size() > 1)
{
MovementGenerator *curr = top();
- Pop();
+ pop();
if (curr)
DelayedDelete(curr);
}
@@ -774,7 +774,7 @@ void MotionMaster::DirectExpire(bool reset)
if (size() > 1)
{
MovementGenerator *curr = top();
- Pop();
+ pop();
DirectDelete(curr);
}
@@ -794,7 +794,7 @@ void MotionMaster::DelayedExpire()
if (size() > 1)
{
MovementGenerator *curr = top();
- Pop();
+ pop();
DelayedDelete(curr);
}
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 7c215fb2ab4..0f46f42e08e 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -166,9 +166,10 @@ class TC_GAME_API MotionMaster
void MoveRotate(uint32 time, RotateDirection direction);
private:
+ void pop();
+
bool NeedInitTop() const;
void InitTop();
- void Pop();
void Mutate(MovementGenerator *m, MovementSlot slot);