From 72093e98e1bdbd3b83d8030d1cb50306bb04b028 Mon Sep 17 00:00:00 2001 From: ratkosrb <35845488+ratkosrb@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:50:12 +0100 Subject: Core/Creature: Use proper name for wander distance. (#24133) * Use proper name for wander distance. * Rename db field. * Fix query. * Remove underscore from chat command. * Rename the handler too. * Update chat command description. * Fix remaining issues. * Rename 2020_99_99_99_world_335.sql to 2020_02_16_01_world.sql Co-authored-by: Giacomo Pozzoni (cherry picked from commit 6176ce92ea01fd33b11c2e7f8e9ebb509e80c944) # Conflicts: # sql/updates/world/master/2020_02_16_01_world.sql # src/server/database/Database/Implementation/WorldDatabase.cpp # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Globals/ObjectMgr.cpp # src/server/game/Globals/ObjectMgr.h # src/server/scripts/Commands/cs_npc.cpp --- src/server/game/Movement/MotionMaster.cpp | 6 +++--- src/server/game/Movement/MotionMaster.h | 2 +- .../game/Movement/MovementGenerators/RandomMovementGenerator.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Movement') diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index c95225ec0dc..a1ca939c1b4 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -573,12 +573,12 @@ void MotionMaster::MoveTargetedHome() } } -void MotionMaster::MoveRandom(float spawndist) +void MotionMaster::MoveRandom(float wanderDistance) { if (_owner->GetTypeId() == TYPEID_UNIT) { - TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveRandom: '%s', started random movement (spawnDist: %f)", _owner->GetGUID().ToString().c_str(), spawndist); - Add(new RandomMovementGenerator(spawndist), MOTION_SLOT_DEFAULT); + TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveRandom: '%s', started random movement (spawnDist: %f)", _owner->GetGUID().ToString().c_str(), wanderDistance); + Add(new RandomMovementGenerator(wanderDistance), MOTION_SLOT_DEFAULT); } } diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 332a85bb6d4..a72a5d70079 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -153,7 +153,7 @@ class TC_GAME_API MotionMaster void MoveIdle(); void MoveTargetedHome(); - void MoveRandom(float spawndist = 0.0f); + void MoveRandom(float wanderDistance = 0.0f); void MoveFollow(Unit* target, float dist, ChaseAngle angle, MovementSlot slot = MOTION_SLOT_ACTIVE); void MoveChase(Unit* target, Optional dist = {}, Optional angle = {}); void MoveChase(Unit* target, float dist, float angle) { MoveChase(target, ChaseRange(dist), ChaseAngle(angle)); } diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 17e842b817c..464902624a6 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -84,7 +84,7 @@ void RandomMovementGenerator::DoInitialize(Creature* owner) owner->StopMoving(); if (_wanderDistance == 0.f) - _wanderDistance = owner->GetRespawnRadius(); + _wanderDistance = owner->GetWanderDistance(); // Retail seems to let a creature walk 2 up to 10 splines before triggering a pause _wanderSteps = urand(2, 10); -- cgit v1.2.3