mirror of
https://github.com/mangosfour/server.git
synced 2025-12-31 22:37:05 +00:00
Merge branch 'master' into 310
Conflicts: src/game/Player.cpp src/game/Player.h src/game/Unit.cpp
This commit is contained in:
commit
963aed5e0b
49 changed files with 1124 additions and 986 deletions
|
|
@ -409,7 +409,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
|
|||
|
||||
uint32 timer = t;
|
||||
|
||||
// sLog.outDetail(" Generated %d waypoints, total time %u.", m_WayPoints.size(), timer);
|
||||
// sLog.outDetail(" Generated %lu waypoints, total time %u.", (unsigned long)m_WayPoints.size(), timer);
|
||||
|
||||
m_curr = m_WayPoints.begin();
|
||||
m_curr = GetNextWayPoint();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue