aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-03-12 11:49:42 +0100
committerfunjoker <funjoker109@gmail.com>2024-03-25 20:17:03 +0100
commitac61b93d1cc3c00f5afe72f44076a65c906a618c (patch)
treebafa9c4e5c1937ffc3cda9dba8b819aeb55ff534
parentb45f7583c71b8312422c87dbf4b4afafd8b438a7 (diff)
Core/Movement: Removed default arg values from MovementGenerator Pause and Resume functions
(cherry picked from commit 6c533482c6ae1a4dd9e525bd225197d4e65e735f)
-rwxr-xr-xsrc/server/game/Movement/MovementGenerator.h4
-rw-r--r--src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp4
-rw-r--r--src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h4
-rw-r--r--src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp4
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index db3843e8c69..17eb2d45a36 100755
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -65,9 +65,9 @@ class TC_GAME_API MovementGenerator
virtual void UnitSpeedChanged() { }
// timer in ms
- virtual void Pause(uint32/* timer = 0*/) { }
+ virtual void Pause(uint32/* timer*/) { }
// timer in ms
- virtual void Resume(uint32/* overrideTimer = 0*/) { }
+ virtual void Resume(uint32/* overrideTimer*/) { }
// used by Evade code for select point to evade with expected restart default movement
virtual bool GetResetPosition(Unit*, float&/* x*/, float&/* y*/, float&/* z*/) { return false; }
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
index df49180b40d..1e2298ed088 100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
@@ -44,7 +44,7 @@ MovementGeneratorType RandomMovementGenerator<T>::GetMovementGeneratorType() con
}
template<class T>
-void RandomMovementGenerator<T>::Pause(uint32 timer /*= 0*/)
+void RandomMovementGenerator<T>::Pause(uint32 timer)
{
if (timer)
{
@@ -60,7 +60,7 @@ void RandomMovementGenerator<T>::Pause(uint32 timer /*= 0*/)
}
template<class T>
-void RandomMovementGenerator<T>::Resume(uint32 overrideTimer /*= 0*/)
+void RandomMovementGenerator<T>::Resume(uint32 overrideTimer)
{
if (overrideTimer)
_timer.Reset(overrideTimer);
diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
index f09ac170b50..5d6ff652f2b 100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
@@ -33,8 +33,8 @@ class RandomMovementGenerator : public MovementGeneratorMedium<T, RandomMovement
MovementGeneratorType GetMovementGeneratorType() const override;
- void Pause(uint32 timer = 0) override;
- void Resume(uint32 overrideTimer = 0) override;
+ void Pause(uint32 timer) override;
+ void Resume(uint32 overrideTimer) override;
void DoInitialize(T*);
void DoReset(T*);
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index f1b118ca8f2..801e176de9e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -71,7 +71,7 @@ MovementGeneratorType WaypointMovementGenerator<Creature>::GetMovementGeneratorT
return WAYPOINT_MOTION_TYPE;
}
-void WaypointMovementGenerator<Creature>::Pause(uint32 timer/* = 0*/)
+void WaypointMovementGenerator<Creature>::Pause(uint32 timer)
{
if (timer)
{
@@ -91,7 +91,7 @@ void WaypointMovementGenerator<Creature>::Pause(uint32 timer/* = 0*/)
}
}
-void WaypointMovementGenerator<Creature>::Resume(uint32 overrideTimer/* = 0*/)
+void WaypointMovementGenerator<Creature>::Resume(uint32 overrideTimer)
{
if (overrideTimer)
_nextMoveTime.Reset(overrideTimer);
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 3764a9629f0..0978758f573 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -47,8 +47,8 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium<Creat
MovementGeneratorType GetMovementGeneratorType() const override;
void UnitSpeedChanged() override { AddFlag(MOVEMENTGENERATOR_FLAG_SPEED_UPDATE_PENDING); }
- void Pause(uint32 timer = 0) override;
- void Resume(uint32 overrideTimer = 0) override;
+ void Pause(uint32 timer) override;
+ void Resume(uint32 overrideTimer) override;
bool GetResetPosition(Unit*, float& x, float& y, float& z) override;
void DoInitialize(Creature*);