diff options
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index e87651224b9..89ad726b253 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -402,12 +402,11 @@ void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 wait void npc_escortAI::FillPointMovementListForCreature() { - ScriptPointVector const& movePoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry()); - if (movePoints.empty()) + ScriptPointVector const* movePoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry()); + if (!movePoints) return; - ScriptPointVector::const_iterator itrEnd = movePoints.end(); - for (ScriptPointVector::const_iterator itr = movePoints.begin(); itr != itrEnd; ++itr) + for (ScriptPointVector::const_iterator itr = movePoints->begin(); itr != movePoints->end(); ++itr) { Escort_Waypoint point(itr->uiPointId, itr->fX, itr->fY, itr->fZ, itr->uiWaitTime); WaypointList.push_back(point); @@ -563,11 +562,11 @@ bool npc_escortAI::SetNextWaypoint(uint32 pointId, bool setPosition, bool resetW bool npc_escortAI::GetWaypointPosition(uint32 pointId, float& x, float& y, float& z) { - ScriptPointVector const& waypoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry()); - if (waypoints.empty()) + ScriptPointVector const* waypoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry()); + if (!waypoints) return false; - for (ScriptPointVector::const_iterator itr = waypoints.begin(); itr != waypoints.end(); ++itr) + for (ScriptPointVector::const_iterator itr = waypoints->begin(); itr != waypoints->end(); ++itr) { if (itr->uiPointId == pointId) { |