From f65edd1130c0ecb6ae59e6cda176a251d96a9c37 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 18 Jul 2019 20:09:00 +0200 Subject: Core/MovementGenerator: Add more details to asserts Include movespline in Unit::GetDebugInfo() and the Player owner in FlightPathMovementGenerator::DoEventIfAny() assert (cherry picked from commit 560b7e33974904938f3f85a2f78c0850df2f9333) --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- .../game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5b4ce78a8a1..cb059be8d7a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13178,6 +13178,7 @@ std::string Unit::GetDebugInfo() const << std::boolalpha << "IsAIEnabled: " << IsAIEnabled() << " DeathState: " << std::to_string(getDeathState()) << " UnitMovementFlags: " << GetUnitMovementFlags() << " ExtraUnitMovementFlags: " << GetExtraUnitMovementFlags() - << " Class: " << std::to_string(GetClass()); + << " Class: " << std::to_string(GetClass()) << "\n" + << " " << (movespline ? movespline->ToString() : "Movespline: "); return sstr.str(); } diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp index 0e24449e9a3..9f4ad081b93 100644 --- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp @@ -244,7 +244,7 @@ void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport() void FlightPathMovementGenerator::DoEventIfAny(Player* owner, TaxiPathNodeEntry const* node, bool departure) { - ASSERT(node); + ASSERT(node, owner->GetDebugInfo().c_str()); if (uint32 eventid = departure ? node->DepartureEventID : node->ArrivalEventID) { -- cgit v1.2.3