1. From 6728f202a64d0b352d16474283607166be52e04b Mon Sep 17 00:00:00 2001
  2. From: Riztazz <[email protected]>
  3. Date: Sun, 5 Jun 2016 17:43:48 +0200
  4. Subject: [PATCH] smooth waypoint movement
  6. excluding smartAI waypoint movement and gotta refactor old shitty quests done via movementInform n shit and move them to escortAI so they use smooth as well
  7. ---
  8. src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 298 ++++++++++-----------
  9. src/server/game/AI/ScriptedAI/ScriptedEscortAI.h | 35 +--
  10. src/server/game/Movement/MotionMaster.cpp | 4 +-
  11. src/server/game/Movement/MotionMaster.h | 2 +-
  12. .../WaypointMovementGenerator.cpp | 127 ++++++---
  13. .../MovementGenerators/WaypointMovementGenerator.h | 18 +-
  14. .../game/Movement/Waypoints/WaypointManager.h | 8 +-
  15. 7 files changed, 261 insertions(+), 231 deletions(-)
  17. diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
  18. index 1b8b472..7681575 100644
  19. --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
  20. +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
  21. @@ -37,6 +37,7 @@ enum Points
  22. npc_escortAI::npc_escortAI(Creature* creature) : ScriptedAI(creature),
  23. m_uiWPWaitTimer(2500),
  24. m_uiPlayerCheckTimer(1000),
  25. + LastWP(0),
  26. m_uiEscortState(STATE_ESCORT_NONE),
  27. MaxPlayerDistance(DEFAULT_MAX_PLAYER_DISTANCE),
  28. m_pQuestForEscort(NULL),
  29. @@ -56,13 +57,8 @@ void npc_escortAI::AttackStart(Unit* who)
  30. return;
  32. if (me->Attack(who, true))
  33. - {
  34. - if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
  35. - me->GetMotionMaster()->MovementExpired();
  36. -
  37. if (IsCombatMovementAllowed())
  38. me->GetMotionMaster()->MoveChase(who);
  39. - }
  40. }
  42. //see followerAI
  43. @@ -228,60 +224,25 @@ void npc_escortAI::UpdateAI(uint32 diff)
  44. {
  45. //Waypoint Updating
  46. if (HasEscortState(STATE_ESCORT_ESCORTING) && !me->GetVictim() && m_uiWPWaitTimer && !HasEscortState(STATE_ESCORT_RETURNING))
  47. - {
  48. if (m_uiWPWaitTimer <= diff)
  49. {
  50. - //End of the line
  51. - if (CurrentWP == WaypointList.end())
  52. + if (!HasEscortState(STATE_ESCORT_PAUSED))
  53. {
  54. - if (DespawnAtEnd)
  55. + if (!m_bStarted)
  56. {
  57. - TC_LOG_DEBUG("scripts", "EscortAI reached end of waypoints");
  58. -
  59. - if (m_bCanReturnToStart)
  60. - {
  61. - float fRetX, fRetY, fRetZ;
  62. - me->GetRespawnPosition(fRetX, fRetY, fRetZ);
  63. -
  64. - me->GetMotionMaster()->MovePoint(POINT_HOME, fRetX, fRetY, fRetZ);
  65. -
  66. - m_uiWPWaitTimer = 0;
  67. -
  68. - TC_LOG_DEBUG("scripts", "EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
  69. - return;
  70. - }
  71. -
  72. - if (m_bCanInstantRespawn)
  73. - {
  74. - me->setDeathState(JUST_DIED);
  75. - me->Respawn();
  76. - }
  77. - else
  78. - me->DespawnOrUnsummon();
  79. -
  80. - return;
  81. + m_bStarted = true;
  82. + me->GetMotionMaster()->MovePath(-int32(me->GetEntry()), false, false);
  83. + m_uiWPWaitTimer = 0;
  84. }
  85. else
  86. {
  87. - TC_LOG_DEBUG("scripts", "EscortAI reached end of waypoints with Despawn off");
  88. -
  89. - return;
  90. + WaypointStart((*CurrentWP)->id);
  91. + m_uiWPWaitTimer = 0;
  92. }
  93. }
  94. -
  95. - if (!HasEscortState(STATE_ESCORT_PAUSED))
  96. - {
  97. - me->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
  98. - TC_LOG_DEBUG("scripts", "EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
  99. -
  100. - WaypointStart(CurrentWP->id);
  101. -
  102. - m_uiWPWaitTimer = 0;
  103. - }
  104. }
  105. else
  106. m_uiWPWaitTimer -= diff;
  107. - }
  109. //Check if player or any member of his group is within range
  110. if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPlayerGUID && !me->GetVictim() && !HasEscortState(STATE_ESCORT_RETURNING))
  111. @@ -322,7 +283,7 @@ void npc_escortAI::UpdateEscortAI(uint32 /*diff*/)
  113. void npc_escortAI::MovementInform(uint32 moveType, uint32 pointId)
  114. {
  115. - if (moveType != POINT_MOTION_TYPE || !HasEscortState(STATE_ESCORT_ESCORTING))
  116. + if ((moveType != POINT_MOTION_TYPE && moveType != WAYPOINT_MOTION_TYPE) || !HasEscortState(STATE_ESCORT_ESCORTING))
  117. return;
  119. //Combat start position reached, continue waypoint movement
  120. @@ -332,34 +293,75 @@ void npc_escortAI::MovementInform(uint32 moveType, uint32 pointId)
  122. me->SetWalk(!m_bIsRunning);
  123. RemoveEscortState(STATE_ESCORT_RETURNING);
  124. -
  125. - if (!m_uiWPWaitTimer)
  126. - m_uiWPWaitTimer = 1;
  127. }
  128. else if (pointId == POINT_HOME)
  129. {
  130. TC_LOG_DEBUG("scripts", "EscortAI has returned to original home location and will continue from beginning of waypoint list.");
  131. -
  132. - CurrentWP = WaypointList.begin();
  133. m_uiWPWaitTimer = 1;
  134. }
  135. - else
  136. + else if (moveType == WAYPOINT_MOTION_TYPE)
  137. {
  138. - //Make sure that we are still on the right waypoint
  139. - if (CurrentWP->id != pointId)
  140. + uint32 point = (*CurrentWP)->id;
  141. +
  142. + //End of the line
  143. + if (LastWP && LastWP == point)
  144. {
  145. - TC_LOG_ERROR("misc", "TSCR ERROR: EscortAI reached waypoint out of order %u, expected %u, creature entry %u", pointId, CurrentWP->id, me->GetEntry());
  146. - return;
  147. - }
  148. + m_bStarted = false;
  149. + me->GetMotionMaster()->MovementExpired();
  150. + me->GetMotionMaster()->MoveIdle();
  152. - TC_LOG_DEBUG("scripts", "EscortAI Waypoint %u reached", CurrentWP->id);
  153. + //Call WP function (after movement expiration)
  154. + WaypointReached(point);
  155. +
  156. + if (DespawnAtEnd)
  157. + {
  158. + TC_LOG_DEBUG("scripts", "EscortAI reached end of waypoints");
  159. +
  160. + if (m_bCanReturnToStart)
  161. + {
  162. + float fRetX, fRetY, fRetZ;
  163. + me->GetRespawnPosition(fRetX, fRetY, fRetZ);
  164. +
  165. + me->GetMotionMaster()->MovePoint(POINT_HOME, fRetX, fRetY, fRetZ);
  166. +
  167. + m_uiWPWaitTimer = 0;
  168. +
  169. + TC_LOG_DEBUG("scripts", "EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
  170. + return;
  171. + }
  172. +
  173. + if (m_bCanInstantRespawn)
  174. + {
  175. + me->setDeathState(JUST_DIED);
  176. + me->Respawn();
  177. + }
  178. + else
  179. + me->DespawnOrUnsummon();
  180. +
  181. + return;
  182. + }
  183. + else
  184. + {
  185. + TC_LOG_DEBUG("scripts", "EscortAI reached end of waypoints with Despawn off");
  186. + return;
  187. + }
  188. + }
  190. //Call WP function
  191. - WaypointReached(CurrentWP->id);
  192. + WaypointReached(point);
  193. + TC_LOG_DEBUG("scripts", "EscortAI Waypoint %u reached", point);
  195. - m_uiWPWaitTimer = CurrentWP->WaitTimeMs + 1;
  196. + m_uiWPWaitTimer = (*CurrentWP)->delay;
  198. ++CurrentWP;
  199. +
  200. + if (!m_uiWPWaitTimer && !HasEscortState(STATE_ESCORT_PAUSED))
  201. + WaypointStart((*CurrentWP)->id);
  202. +
  203. + if (m_bIsRunning)
  204. + me->SetWalk(false);
  205. + else
  206. + me->SetWalk(true);
  207. }
  208. }
  210. @@ -384,9 +386,42 @@ void npc_escortAI::OnPossess(bool apply)
  212. void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 waitTime)
  213. {
  214. - Escort_Waypoint t(id, x, y, z, waitTime);
  215. + int32 entry = -int32(me->GetEntry());
  217. - WaypointList.push_back(t);
  218. + WaypointPathContainer::iterator itr = sWaypointMgr->_waypointStore.find(entry);
  219. + if (itr != sWaypointMgr->_waypointStore.end())
  220. + {
  221. + for (WaypointPath::const_iterator it = itr->second.begin(); it != itr->second.end(); ++it)
  222. + {
  223. + if ((*it)->id == id)
  224. + {
  225. + itr->second.erase(it);
  226. + break;
  227. + }
  228. + }
  229. + }
  230. +
  231. + WaypointPath& path = sWaypointMgr->_waypointStore[entry];
  232. + WaypointData* wp = new WaypointData();
  233. +
  234. + Trinity::NormalizeMapCoord(x);
  235. + Trinity::NormalizeMapCoord(y);
  236. +
  237. + wp->id = id;
  238. + wp->x = x;
  239. + wp->y = y;
  240. + wp->z = z;
  241. + wp->orientation = me->GetOrientation();
  242. + wp->move_type = 0;
  243. + wp->delay = waitTime;
  244. + wp->event_id = 0;
  245. + wp->event_chance = 100;
  246. +
  247. + path.push_back(wp);
  248. +
  249. + CurrentWP = path.begin();
  250. +
  251. + LastWP = id;
  253. // i think SD2 no longer uses this function
  254. ScriptWP = true;
  255. @@ -406,12 +441,47 @@ void npc_escortAI::FillPointMovementListForCreature()
  256. if (movePoints.empty())
  257. return;
  259. - ScriptPointVector::const_iterator itrEnd = movePoints.end();
  260. - for (ScriptPointVector::const_iterator itr = movePoints.begin(); itr != itrEnd; ++itr)
  261. + int32 entry = -int32(me->GetEntry());
  262. +
  263. + WaypointPathContainer::iterator itr = sWaypointMgr->_waypointStore.find(entry);
  264. + if (itr != sWaypointMgr->_waypointStore.end())
  265. {
  266. - Escort_Waypoint point(itr->uiPointId, itr->fX, itr->fY, itr->fZ, itr->uiWaitTime);
  267. - WaypointList.push_back(point);
  268. + for (WaypointPath::const_iterator it = itr->second.begin(); it != itr->second.end(); ++it)
  269. + delete *it;
  270. +
  271. + sWaypointMgr->_waypointStore.erase(itr);
  272. + }
  273. +
  274. + WaypointPath& path = sWaypointMgr->_waypointStore[entry];
  275. +
  276. + ScriptPointVector::const_iterator itrEnd = movePoints.end() - 1;
  277. + LastWP = itrEnd->uiPointId;
  278. +
  279. + for (ScriptPointVector::const_iterator itr = movePoints.begin(); itr != movePoints.end(); ++itr)
  280. + {
  281. + WaypointData* wp = new WaypointData();
  282. +
  283. + float x = itr->fX;
  284. + float y = itr->fY;
  285. + float z = itr->fZ;
  286. +
  287. + Trinity::NormalizeMapCoord(x);
  288. + Trinity::NormalizeMapCoord(y);
  289. +
  290. + wp->id = itr->uiPointId;
  291. + wp->x = x;
  292. + wp->y = y;
  293. + wp->z = z;
  294. + wp->orientation = me->GetOrientation();
  295. + wp->move_type = 0;
  296. + wp->delay = itr->uiWaitTime;
  297. + wp->event_id = 0;
  298. + wp->event_chance = 100;
  299. +
  300. + path.push_back(wp);
  301. }
  302. +
  303. + CurrentWP = path.begin();
  304. }
  306. void npc_escortAI::SetRun(bool on)
  307. @@ -449,20 +519,6 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
  308. return;
  309. }
  311. - if (!ScriptWP && resetWaypoints) // sd2 never adds wp in script, but tc does
  312. - {
  313. - if (!WaypointList.empty())
  314. - WaypointList.clear();
  315. - FillPointMovementListForCreature();
  316. - }
  317. -
  318. - if (WaypointList.empty())
  319. - {
  320. - TC_LOG_ERROR("scripts", "EscortAI (script: %s, creature entry: %u) starts with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).",
  321. - me->GetScriptName().c_str(), me->GetEntry(), quest ? quest->GetQuestId() : 0);
  322. - return;
  323. - }
  324. -
  325. //set variables
  326. m_bIsActiveAttacker = isActiveAttacker;
  327. m_bIsRunning = run;
  328. @@ -473,6 +529,9 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
  329. m_bCanInstantRespawn = instantRespawn;
  330. m_bCanReturnToStart = canLoopPath;
  332. + if (!ScriptWP && resetWaypoints) // sd2 never adds wp in script, but tc does
  333. + FillPointMovementListForCreature();
  334. +
  335. if (m_bCanReturnToStart && m_bCanInstantRespawn)
  336. TC_LOG_DEBUG("scripts", "EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
  338. @@ -491,9 +550,7 @@ void npc_escortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false
  339. me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
  340. }
  342. - TC_LOG_DEBUG("scripts", "EscortAI started with " UI64FMTD " waypoints. ActiveAttacker = %d, Run = %d, %s", uint64(WaypointList.size()), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID.ToString().c_str());
  343. -
  344. - CurrentWP = WaypointList.begin();
  345. + TC_LOG_DEBUG("scripts", "EscortAI started waypoints. ActiveAttacker = %d, Run = %d.", m_bIsActiveAttacker, m_bIsRunning);
  347. //Set initial speed
  348. if (m_bIsRunning)
  349. @@ -510,73 +567,14 @@ void npc_escortAI::SetEscortPaused(bool on)
  350. return;
  352. if (on)
  353. - AddEscortState(STATE_ESCORT_PAUSED);
  354. - else
  355. - RemoveEscortState(STATE_ESCORT_PAUSED);
  356. -}
  357. -
  358. -bool npc_escortAI::SetNextWaypoint(uint32 pointId, float x, float y, float z, float orientation)
  359. -{
  360. - me->UpdatePosition(x, y, z, orientation);
  361. - return SetNextWaypoint(pointId, false, true);
  362. -}
  363. -
  364. -bool npc_escortAI::SetNextWaypoint(uint32 pointId, bool setPosition, bool resetWaypointsOnFail)
  365. -{
  366. - if (!WaypointList.empty())
  367. - WaypointList.clear();
  368. -
  369. - FillPointMovementListForCreature();
  370. -
  371. - if (WaypointList.empty())
  372. - return false;
  373. -
  374. - size_t const size = WaypointList.size();
  375. - Escort_Waypoint waypoint(0, 0, 0, 0, 0);
  376. - do
  377. {
  378. - waypoint = WaypointList.front();
  379. - WaypointList.pop_front();
  380. - if (waypoint.id == pointId)
  381. - {
  382. - if (setPosition)
  383. - me->UpdatePosition(waypoint.x, waypoint.y, waypoint.z, me->GetOrientation());
  384. -
  385. - CurrentWP = WaypointList.begin();
  386. - return true;
  387. - }
  388. - }
  389. - while (!WaypointList.empty());
  390. -
  391. - // we failed.
  392. - // we reset the waypoints in the start; if we pulled any, reset it again
  393. - if (resetWaypointsOnFail && size != WaypointList.size())
  394. - {
  395. - if (!WaypointList.empty())
  396. - WaypointList.clear();
  397. -
  398. - FillPointMovementListForCreature();
  399. + AddEscortState(STATE_ESCORT_PAUSED);
  400. + me->StopMoving();
  401. }
  402. -
  403. - return false;
  404. -}
  405. -
  406. -bool npc_escortAI::GetWaypointPosition(uint32 pointId, float& x, float& y, float& z)
  407. -{
  408. - ScriptPointVector const& waypoints = sScriptSystemMgr->GetPointMoveList(me->GetEntry());
  409. - if (waypoints.empty())
  410. - return false;
  411. -
  412. - for (ScriptPointVector::const_iterator itr = waypoints.begin(); itr != waypoints.end(); ++itr)
  413. + else
  414. {
  415. - if (itr->uiPointId == pointId)
  416. - {
  417. - x = itr->fX;
  418. - y = itr->fY;
  419. - z = itr->fZ;
  420. - return true;
  421. - }
  422. + RemoveEscortState(STATE_ESCORT_PAUSED);
  423. + if (WaypointMovementGenerator<Creature>* move = (WaypointMovementGenerator<Creature>*)(me->GetMotionMaster()->top()))
  424. + move->GetTrackerTimer().Reset(1);
  425. }
  426. -
  427. - return false;
  428. }
  429. diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
  430. index 37a1464..92ca5fb 100644
  431. --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
  432. +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
  433. @@ -20,27 +20,11 @@
  434. #define SC_ESCORTAI_H
  436. #include "ScriptSystem.h"
  437. +#include "WaypointMovementGenerator.h"
  438. +#include "WaypointManager.h"
  440. #define DEFAULT_MAX_PLAYER_DISTANCE 50
  442. -struct Escort_Waypoint
  443. -{
  444. - Escort_Waypoint(uint32 _id, float _x, float _y, float _z, uint32 _w)
  445. - {
  446. - id = _id;
  447. - x = _x;
  448. - y = _y;
  449. - z = _z;
  450. - WaitTimeMs = _w;
  451. - }
  452. -
  453. - uint32 id;
  454. - float x;
  455. - float y;
  456. - float z;
  457. - uint32 WaitTimeMs;
  458. -};
  459. -
  460. enum eEscortState
  461. {
  462. STATE_ESCORT_NONE = 0x000, //nothing in progress
  463. @@ -76,15 +60,6 @@ struct TC_GAME_API npc_escortAI : public ScriptedAI
  464. // EscortAI functions
  465. void AddWaypoint(uint32 id, float x, float y, float z, uint32 waitTime = 0); // waitTime is in ms
  467. - //this will set the current position to x/y/z/o, and the current WP to pointId.
  468. - bool SetNextWaypoint(uint32 pointId, float x, float y, float z, float orientation);
  469. -
  470. - //this will set the current position to WP start position (if setPosition == true),
  471. - //and the current WP to pointId
  472. - bool SetNextWaypoint(uint32 pointId, bool setPosition = true, bool resetWaypointsOnFail = true);
  473. -
  474. - bool GetWaypointPosition(uint32 pointId, float& x, float& y, float& z);
  475. -
  476. virtual void WaypointReached(uint32 pointId) = 0;
  477. virtual void WaypointStart(uint32 /*pointId*/) { }
  479. @@ -120,17 +95,17 @@ struct TC_GAME_API npc_escortAI : public ScriptedAI
  480. uint32 m_uiWPWaitTimer;
  481. uint32 m_uiPlayerCheckTimer;
  482. uint32 m_uiEscortState;
  483. + uint32 LastWP;
  484. float MaxPlayerDistance;
  486. + WaypointPath::const_iterator CurrentWP;
  487. Quest const* m_pQuestForEscort; //generally passed in Start() when regular escort script.
  489. - std::list<Escort_Waypoint> WaypointList;
  490. - std::list<Escort_Waypoint>::iterator CurrentWP;
  491. -
  492. bool m_bIsActiveAttacker; //obsolete, determined by faction.
  493. bool m_bIsRunning; //all creatures are walking by default (has flag MOVEMENTFLAG_WALK)
  494. bool m_bCanInstantRespawn; //if creature should respawn instantly after escort over (if not, database respawntime are used)
  495. bool m_bCanReturnToStart; //if creature can walk same path (loop) without despawn. Not for regular escort quests.
  496. + bool m_bStarted;
  497. bool DespawnAtEnd;
  498. bool DespawnAtFar;
  499. bool ScriptWP;
  500. diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
  501. index 6f7dae1..3da90e8 100644
  502. --- a/src/server/game/Movement/MotionMaster.cpp
  503. +++ b/src/server/game/Movement/MotionMaster.cpp
  504. @@ -647,7 +647,7 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
  505. }
  506. }
  508. -void MotionMaster::MovePath(uint32 path_id, bool repeatable)
  509. +void MotionMaster::MovePath(int32 path_id, bool repeatable, bool loadFromDB /* = false*/)
  510. {
  511. if (!path_id)
  512. return;
  513. @@ -664,7 +664,7 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable)
  515. //_owner->GetTypeId() == TYPEID_PLAYER ?
  516. //Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)):
  517. - Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE);
  518. + Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable, loadFromDB), MOTION_SLOT_IDLE);
  520. TC_LOG_DEBUG("misc", "%s (GUID: %u) starts moving over path(Id:%u, repeatable: %s).",
  521. _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature",
  522. diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
  523. index 005f10b..0bfb9c1 100644
  524. --- a/src/server/game/Movement/MotionMaster.h
  525. +++ b/src/server/game/Movement/MotionMaster.h
  526. @@ -200,7 +200,7 @@ class TC_GAME_API MotionMaster //: private std::stack<MovementGenerator *>
  527. void MoveSeekAssistanceDistract(uint32 timer);
  528. void MoveTaxiFlight(uint32 path, uint32 pathnode);
  529. void MoveDistract(uint32 time);
  530. - void MovePath(uint32 path_id, bool repeatable);
  531. + void MovePath(int32 path_id, bool repeatable, bool loadFromDB = true);
  532. void MoveRotate(uint32 time, RotateDirection direction);
  534. MovementGeneratorType GetCurrentMovementGeneratorType() const;
  535. diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
  536. index 2ffa1a6..de9cd1d 100755
  537. --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
  538. +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
  539. @@ -45,13 +45,13 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature)
  540. return;
  541. }
  543. - StartMoveNow(creature);
  544. + if (!Stopped())
  545. + StartMoveNow(creature);
  546. }
  548. void WaypointMovementGenerator<Creature>::DoInitialize(Creature* creature)
  549. {
  550. LoadPath(creature);
  551. - creature->AddUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE);
  552. }
  554. void WaypointMovementGenerator<Creature>::DoFinalize(Creature* creature)
  555. @@ -62,18 +62,14 @@ void WaypointMovementGenerator<Creature>::DoFinalize(Creature* creature)
  557. void WaypointMovementGenerator<Creature>::DoReset(Creature* creature)
  558. {
  559. - creature->AddUnitState(UNIT_STATE_ROAMING|UNIT_STATE_ROAMING_MOVE);
  560. - StartMoveNow(creature);
  561. + if (!Stopped())
  562. + StartMoveNow(creature);
  563. }
  565. void WaypointMovementGenerator<Creature>::OnArrived(Creature* creature)
  566. {
  567. if (!i_path || i_path->empty())
  568. return;
  569. - if (m_isArrivalDone)
  570. - return;
  571. -
  572. - m_isArrivalDone = true;
  574. if (i_path->at(i_currentNode)->event_id && urand(0, 99) < i_path->at(i_currentNode)->event_chance)
  575. {
  576. @@ -82,14 +78,46 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* creature)
  577. creature->GetMap()->ScriptsStart(sWaypointScripts, i_path->at(i_currentNode)->event_id, creature, NULL);
  578. }
  580. + if (i_path->at(i_currentNode)->delay)
  581. + {
  582. + creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
  583. + Stop(i_path->at(i_currentNode)->delay);
  584. + creature->StopMoving();
  585. + }
  586. +
  587. // Inform script
  588. MovementInform(creature);
  589. creature->UpdateWaypointID(i_currentNode);
  590. +}
  592. - if (i_path->at(i_currentNode)->delay)
  593. +void WaypointMovementGenerator<Creature>::FormationMove(Creature* creature)
  594. +{
  595. + bool transportPath = creature->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && creature->GetTransGUID();
  596. +
  597. + WaypointData const* node = i_path->at(i_currentNode);
  598. +
  599. + Movement::Location formationDest(node->x, node->y, node->z, 0.0f);
  600. +
  601. + //! If creature is on transport, we assume waypoints set in DB are already transport offsets
  602. + if (transportPath)
  603. + if (TransportBase* trans = creature->GetDirectTransport())
  604. + trans->CalculatePassengerPosition(formationDest.x, formationDest.y, formationDest.z, &formationDest.orientation);
  605. +
  606. + if (loadFromDB)
  607. {
  608. - creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
  609. - Stop(i_path->at(i_currentNode)->delay);
  610. + Movement::MoveSplineInit init(creature);
  611. + //! Accepts angles such as 0.00001 and -0.00001, 0 must be ignored, default value in waypoint table
  612. + if (node->orientation && node->delay)
  613. + init.SetFacing(node->orientation);
  614. + init.SetWalk(node->move_type == WAYPOINT_MOVE_TYPE_RUN ? true : false);
  615. + }
  616. +
  617. + //Call for creature group update
  618. + if (creature->GetFormation() && creature->GetFormation()->getLeader() == creature)
  619. + {
  620. + if (loadFromDB)
  621. + creature->SetWalk(node->move_type == WAYPOINT_MOVE_TYPE_RUN ? true : false);
  622. + creature->GetFormation()->LeaderMoveTo(formationDest.x, formationDest.y, formationDest.z);
  623. }
  624. }
  626. @@ -98,8 +126,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
  627. if (!i_path || i_path->empty())
  628. return false;
  630. - if (Stopped())
  631. - return true;
  632. + next_currentNode = i_currentNode;
  634. bool transportPath = creature->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && creature->GetTransGUID();
  636. @@ -133,13 +160,14 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
  637. }
  639. i_currentNode = (i_currentNode+1) % i_path->size();
  640. + next_currentNode = 0;
  641. }
  643. WaypointData const* node = i_path->at(i_currentNode);
  645. m_isArrivalDone = false;
  647. - creature->AddUnitState(UNIT_STATE_ROAMING_MOVE);
  648. + creature->AddUnitState(UNIT_STATE_ROAMING | UNIT_STATE_ROAMING_MOVE);
  650. Movement::Location formationDest(node->x, node->y, node->z, 0.0f);
  651. Movement::MoveSplineInit init(creature);
  652. @@ -152,30 +180,41 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature* creature)
  653. trans->CalculatePassengerPosition(formationDest.x, formationDest.y, formationDest.z, &formationDest.orientation);
  654. }
  656. - //! Do not use formationDest here, MoveTo requires transport offsets due to DisableTransportPathTransformations() call
  657. - //! but formationDest contains global coordinates
  658. - init.MoveTo(node->x, node->y, node->z);
  659. + if (loadFromDB)
  660. + {
  661. + //! Accepts angles such as 0.00001 and -0.00001, 0 must be ignored, default value in waypoint table
  662. + if (node->orientation && node->delay)
  663. + init.SetFacing(node->orientation);
  665. - //! Accepts angles such as 0.00001 and -0.00001, 0 must be ignored, default value in waypoint table
  666. - if (node->orientation && node->delay)
  667. - init.SetFacing(node->orientation);
  668. + switch (node->move_type)
  669. + {
  670. + case WAYPOINT_MOVE_TYPE_LAND:
  671. + init.SetAnimation(Movement::ToGround);
  672. + break;
  673. + case WAYPOINT_MOVE_TYPE_TAKEOFF:
  674. + init.SetAnimation(Movement::ToFly);
  675. + break;
  676. + case WAYPOINT_MOVE_TYPE_RUN:
  677. + init.SetWalk(false);
  678. + break;
  679. + case WAYPOINT_MOVE_TYPE_WALK:
  680. + init.SetWalk(true);
  681. + break;
  682. + }
  683. + }
  685. - switch (node->move_type)
  686. + auto end = i_path->size();
  687. + Movement::PointsArray pathing;
  688. + pathing.push_back(G3D::Vector3(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ()));
  689. + for (auto i = i_currentNode; i < end; ++i)
  690. {
  691. - case WAYPOINT_MOVE_TYPE_LAND:
  692. - init.SetAnimation(Movement::ToGround);
  693. - break;
  694. - case WAYPOINT_MOVE_TYPE_TAKEOFF:
  695. - init.SetAnimation(Movement::ToFly);
  696. - break;
  697. - case WAYPOINT_MOVE_TYPE_RUN:
  698. - init.SetWalk(false);
  699. - break;
  700. - case WAYPOINT_MOVE_TYPE_WALK:
  701. - init.SetWalk(true);
  702. - break;
  703. + node = i_path->at(i);
  704. + pathing.push_back(G3D::Vector3(node->x, node->y, node->z));
  705. }
  707. + (creature->CanFly() || creature->IsFlying()) ? init.SetFly() : init.SetSmooth();
  708. + init.MovebyPath(pathing);
  709. +
  710. init.Launch();
  712. //Call for creature group update
  713. @@ -204,7 +243,7 @@ bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 di
  714. if (Stopped())
  715. {
  716. if (CanMove(diff))
  717. - return StartMove(creature);
  718. + return StartMoveNow(creature);
  719. }
  720. else
  721. {
  722. @@ -213,15 +252,27 @@ bool WaypointMovementGenerator<Creature>::DoUpdate(Creature* creature, uint32 di
  723. creature->SetHomePosition(creature->GetPosition());
  725. if (creature->IsStopped())
  726. - Stop(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER));
  727. + Stop(loadFromDB ? sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER) : 2 * HOUR * IN_MILLISECONDS);
  728. else if (creature->movespline->Finalized())
  729. {
  730. + m_isArrivalDone = true;
  731. OnArrived(creature);
  732. - return StartMove(creature);
  733. + return loadFromDB ? StartMove(creature) : true;
  734. + }
  735. + else
  736. + {
  737. + auto pointId = uint32(creature->movespline->currentPathIdx()) + next_currentNode;
  738. + if (pointId > i_currentNode)
  739. + {
  740. + OnArrived(creature);
  741. + i_currentNode = pointId;
  742. + FormationMove(creature);
  743. + return i_currentNode < (i_path->size() - 1);
  744. + }
  745. }
  746. }
  747. - return true;
  748. - }
  749. + return true;
  750. +}
  752. void WaypointMovementGenerator<Creature>::MovementInform(Creature* creature)
  753. {
  754. diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
  755. index 7230982..ddd45ae 100755
  756. --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
  757. +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
  758. @@ -37,7 +37,7 @@ template<class T, class P>
  759. class PathMovementBase
  760. {
  761. public:
  762. - PathMovementBase() : i_path(), i_currentNode(0) { }
  763. + PathMovementBase() : i_path(), i_currentNode(0), next_currentNode(0) { }
  764. virtual ~PathMovementBase() { };
  766. uint32 GetCurrentNode() const { return i_currentNode; }
  767. @@ -45,6 +45,7 @@ class PathMovementBase
  768. protected:
  769. P i_path;
  770. uint32 i_currentNode;
  771. + uint32 next_currentNode;
  772. };
  774. template<class T>
  775. @@ -55,8 +56,8 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea
  776. public PathMovementBase<Creature, WaypointPath const*>
  777. {
  778. public:
  779. - WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true)
  780. - : i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating) { }
  781. + WaypointMovementGenerator(int32 _path_id = 0, bool _repeating = true, bool _loadFromDB = true)
  782. + : i_nextMoveTime(0), m_isArrivalDone(false), path_id(_path_id), repeating(_repeating), loadFromDB(_loadFromDB) { }
  783. ~WaypointMovementGenerator() { i_path = NULL; }
  784. void DoInitialize(Creature*);
  785. void DoFinalize(Creature*);
  786. @@ -72,6 +73,8 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea
  788. bool GetResetPos(Creature*, float& x, float& y, float& z);
  790. + TimeTrackerSmall & GetTrackerTimer() { return i_nextMoveTime; }
  791. +
  792. private:
  794. void Stop(int32 time) { i_nextMoveTime.Reset(time);}
  795. @@ -87,16 +90,19 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea
  796. void OnArrived(Creature*);
  797. bool StartMove(Creature*);
  799. - void StartMoveNow(Creature* creature)
  800. + void FormationMove(Creature*);
  801. +
  802. + bool StartMoveNow(Creature* creature)
  803. {
  804. i_nextMoveTime.Reset(0);
  805. - StartMove(creature);
  806. + return StartMove(creature);
  807. }
  809. TimeTrackerSmall i_nextMoveTime;
  810. bool m_isArrivalDone;
  811. - uint32 path_id;
  812. + int32 path_id;
  813. bool repeating;
  814. + bool loadFromDB;
  815. };
  817. /** FlightPathMovementGenerator generates movement of the player for the paths
  818. diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
  819. index 63dc418..bd14f4f 100644
  820. --- a/src/server/game/Movement/Waypoints/WaypointManager.h
  821. +++ b/src/server/game/Movement/Waypoints/WaypointManager.h
  822. @@ -42,7 +42,7 @@ struct WaypointData
  823. };
  825. typedef std::vector<WaypointData*> WaypointPath;
  826. -typedef std::unordered_map<uint32, WaypointPath> WaypointPathContainer;
  827. +typedef std::unordered_map<int32, WaypointPath> WaypointPathContainer;
  829. class TC_GAME_API WaypointMgr
  830. {
  831. @@ -56,7 +56,7 @@ class TC_GAME_API WaypointMgr
  832. void Load();
  834. // Returns the path from a given id
  835. - WaypointPath const* GetPath(uint32 id) const
  836. + WaypointPath const* GetPath(int32 id) const
  837. {
  838. WaypointPathContainer::const_iterator itr = _waypointStore.find(id);
  839. if (itr != _waypointStore.end())
  840. @@ -65,11 +65,11 @@ class TC_GAME_API WaypointMgr
  841. return NULL;
  842. }
  844. + WaypointPathContainer _waypointStore;
  845. +
  846. private:
  847. WaypointMgr();
  848. ~WaypointMgr();
  849. -
  850. - WaypointPathContainer _waypointStore;
  851. };
  853. #define sWaypointMgr WaypointMgr::instance()
  854. --
  855. 1.9.5.msysgit.0