From b4339691f969a3736b569d75d2e812da4804ed67 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 2 Sep 2019 03:37:55 -0500 Subject: [PATCH] Logs::Pathing to LogPathing --- zone/mob_ai.cpp | 6 +++--- zone/waypoints.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index dd0bb5cc6..cc00db01a 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -1775,7 +1775,7 @@ void NPC::AI_DoMovement() { else if (gridno < 0) { // this mob is under quest control if (pause_timer_complete == true) { // time to pause has ended SetGrid(0 - GetGrid()); // revert to AI control - Log(Logs::Detail, Logs::Pathing, "Quest pathing is finished. Resuming on grid %d", GetGrid()); + LogPathing("Quest pathing is finished. Resuming on grid [{}]", GetGrid()); SetAppearance(eaStanding, false); @@ -1843,10 +1843,10 @@ void NPC::AI_SetupNextWaypoint() { } else { pause_timer_complete = false; - Log(Logs::Detail, Logs::Pathing, "We are departing waypoint %d.", cur_wp); + LogPathing("We are departing waypoint [{}]", cur_wp); //if we were under quest control (with no grid), we are done now.. if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) { - Log(Logs::Detail, Logs::Pathing, "Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode."); + LogPathing("Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode"); roamer = false; cur_wp = 0; } diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index c84540020..0c6c97180 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -104,7 +104,7 @@ void NPC::StopWandering() roamer = false; CastToNPC()->SetGrid(0); StopNavigation(); - Log(Logs::Detail, Logs::Pathing, "Stop Wandering requested."); + LogPathing("Stop Wandering requested"); return; } @@ -123,11 +123,11 @@ void NPC::ResumeWandering() cur_wp = save_wp; UpdateWaypoint(cur_wp); // have him head to last destination from here } - Log(Logs::Detail, Logs::Pathing, "Resume Wandering requested. Grid %d, wp %d", GetGrid(), cur_wp); + LogPathing("Resume Wandering requested. Grid [{}], wp [{}]", GetGrid(), cur_wp); } else if (AI_walking_timer->Enabled()) { // we are at a waypoint paused normally - Log(Logs::Detail, Logs::Pathing, "Resume Wandering on timed pause. Grid %d, wp %d", GetGrid(), cur_wp); + LogPathing("Resume Wandering on timed pause. Grid [{}], wp [{}]", GetGrid(), cur_wp); AI_walking_timer->Trigger(); // disable timer to end pause now } else @@ -159,7 +159,7 @@ void NPC::PauseWandering(int pausetime) if (GetGrid() != 0) { moving = false; DistractedFromGrid = true; - Log(Logs::Detail, Logs::Pathing, "Paused Wandering requested. Grid %d. Resuming in %d ms (0=not until told)", GetGrid(), pausetime); + LogPathing("Paused Wandering requested. Grid [{}]. Resuming in [{}] ms (0=not until told)", GetGrid(), pausetime); StopNavigation(); if (pausetime < 1) { // negative grid number stops him dead in his tracks until ResumeWandering() SetGrid(0 - GetGrid()); @@ -609,7 +609,7 @@ void Mob::SendToFixZ(float new_x, float new_y, float new_z) { float newz = zone->zonemap->FindBestZ(dest, nullptr); - Log(Logs::Moderate, Logs::Pathing, "BestZ returned %4.3f at %4.3f, %4.3f, %4.3f", newz, m_Position.x, m_Position.y, m_Position.z); + LogPathing("BestZ returned %4.3f at %4.3f, %4.3f, %4.3f", newz, m_Position.x, m_Position.y, m_Position.z); if ((newz > -2000) && std::abs(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaSendTo)) // Sanity check. m_Position.z = newz + 1;