mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 22:58:34 +00:00
merge upstream
This commit is contained in:
+6
-2
@@ -31,7 +31,7 @@
|
||||
|
||||
#include "../common/features.h"
|
||||
#include "../common/guilds.h"
|
||||
#include "../common/spdat.h"
|
||||
|
||||
#include "guild_mgr.h"
|
||||
#include "net.h"
|
||||
#include "petitions.h"
|
||||
@@ -46,6 +46,10 @@
|
||||
#define strcasecmp _stricmp
|
||||
#endif
|
||||
|
||||
#ifdef BOTS
|
||||
#include "bot.h"
|
||||
#endif
|
||||
|
||||
extern Zone *zone;
|
||||
extern volatile bool ZoneLoaded;
|
||||
extern WorldServer worldserver;
|
||||
@@ -2631,7 +2635,7 @@ void EntityList::FindPathsToAllNPCs()
|
||||
while (it != npc_list.end()) {
|
||||
Map::Vertex Node0 = zone->pathing->GetPathNodeCoordinates(0, false);
|
||||
Map::Vertex Dest(it->second->GetX(), it->second->GetY(), it->second->GetZ());
|
||||
std::list<int> Route = zone->pathing->FindRoute(Node0, Dest);
|
||||
std::deque<int> Route = zone->pathing->FindRoute(Node0, Dest);
|
||||
if (Route.size() == 0)
|
||||
printf("Unable to find a route to %s\n", it->second->GetName());
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user