pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 08:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter zone_points [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-04-05 19:49:04 -05:00
parent 9aac84a405
commit 2f4a217f7a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/zone.cpp
View File

@ -1841,16 +1841,22 @@ ZonePoint* Zone::GetClosestZonePointWithoutZone(float x, float y, float z, Clien
return closest_zp; return closest_zp;
} }
bool ZoneDatabase::LoadStaticZonePoints(LinkedList<ZonePoint*>* zone_point_list, const char* zonename, uint32 version) bool ZoneDatabase::LoadStaticZonePoints(LinkedList<ZonePoint *> *zone_point_list, const char *zonename, uint32 version)
{ {
zone_point_list->Clear(); zone_point_list->Clear();
zone->numzonepoints = 0; zone->numzonepoints = 0;
std::string query = StringFormat("SELECT x, y, z, target_x, target_y, "
std::string query = StringFormat(
"SELECT x, y, z, target_x, target_y, "
"target_z, target_zone_id, heading, target_heading, " "target_z, target_zone_id, heading, target_heading, "
"number, target_instance, client_version_mask " "number, target_instance, client_version_mask "
"FROM zone_points WHERE zone='%s' AND (version=%i OR version=-1) " "FROM zone_points WHERE zone='%s' AND (version=%i OR version=-1) %s"
"ORDER BY number", "ORDER BY number",
zonename, version); zonename,
version,
ContentFilterCriteria::apply().c_str()
);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return false; return false;