aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-07-18 20:09:00 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-16 22:03:52 +0100
commitf65edd1130c0ecb6ae59e6cda176a251d96a9c37 (patch)
tree9c570ccdc95c36992666e430ec082d3e098709f8 /src
parenta24a5e77786266ee9456fa8c422a173168804a1f (diff)
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)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
-rw-r--r--src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp2
2 files changed, 3 insertions, 2 deletions
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: <none>");
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)
{