From ac61b93d1cc3c00f5afe72f44076a65c906a618c Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 12 Mar 2024 11:49:42 +0100 Subject: Core/Movement: Removed default arg values from MovementGenerator Pause and Resume functions (cherry picked from commit 6c533482c6ae1a4dd9e525bd225197d4e65e735f) --- src/server/game/Movement/MovementGenerator.h | 4 ++-- .../game/Movement/MovementGenerators/RandomMovementGenerator.cpp | 4 ++-- src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h | 4 ++-- .../game/Movement/MovementGenerators/WaypointMovementGenerator.cpp | 4 ++-- .../game/Movement/MovementGenerators/WaypointMovementGenerator.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') 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::GetMovementGeneratorType() con } template -void RandomMovementGenerator::Pause(uint32 timer /*= 0*/) +void RandomMovementGenerator::Pause(uint32 timer) { if (timer) { @@ -60,7 +60,7 @@ void RandomMovementGenerator::Pause(uint32 timer /*= 0*/) } template -void RandomMovementGenerator::Resume(uint32 overrideTimer /*= 0*/) +void RandomMovementGenerator::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::GetMovementGeneratorT return WAYPOINT_MOTION_TYPE; } -void WaypointMovementGenerator::Pause(uint32 timer/* = 0*/) +void WaypointMovementGenerator::Pause(uint32 timer) { if (timer) { @@ -91,7 +91,7 @@ void WaypointMovementGenerator::Pause(uint32 timer/* = 0*/) } } -void WaypointMovementGenerator::Resume(uint32 overrideTimer/* = 0*/) +void WaypointMovementGenerator::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 : public MovementGeneratorMedium