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

LoadProximities converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-10-08 14:15:43 -07:00
parent 0d8cbca016
commit 1da70ee6ed
1 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
zone/tasks.cpp
View File

@ -3299,47 +3299,33 @@ TaskProximityManager::~TaskProximityManager() {
} }
bool TaskProximityManager::LoadProximities(int ZoneID) { bool TaskProximityManager::LoadProximities(int zoneID) {
TaskProximity proximity;
const char *ProximityQuery = "SELECT `exploreid`, `minx`, `maxx`, `miny`, `maxy`, " _log(TASKS__GLOBALLOAD, "TaskProximityManager::LoadProximities Called for zone %i", zoneID);
"`minz`, `maxz` from `proximities` WHERE `zoneid`=%i "
"ORDER BY `zoneid` ASC";
const char *ERR_MYSQLERROR = "Error in TaskProximityManager::LoadProximities %s %s";
char errbuf[MYSQL_ERRMSG_SIZE];
char* query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
TaskProximity Proximity;
_log(TASKS__GLOBALLOAD, "TaskProximityManager::LoadProximities Called for zone %i", ZoneID);
TaskProximities.clear(); TaskProximities.clear();
if(database.RunQuery(query,MakeAnyLenString(&query,ProximityQuery, ZoneID),errbuf,&result)) { std::string query = StringFormat("SELECT `exploreid`, `minx`, `maxx`, "
"`miny`, `maxy`, `minz`, `maxz` "
while((row = mysql_fetch_row(result))) { "FROM `proximities` WHERE `zoneid` = %i "
Proximity.ExploreID = atoi(row[0]); "ORDER BY `zoneid` ASC", zoneID);
Proximity.MinX = atof(row[1]); auto results = database.QueryDatabase(query);
Proximity.MaxX = atof(row[2]); if (!results.Success()) {
Proximity.MinY = atof(row[3]); LogFile->write(EQEMuLog::Error, "Error in TaskProximityManager::LoadProximities %s %s", query.c_str(), results.ErrorMessage().c_str());
Proximity.MaxY = atof(row[4]);
Proximity.MinZ = atof(row[5]);
Proximity.MaxZ = atof(row[6]);
TaskProximities.push_back(Proximity);
}
mysql_free_result(result);
}
else {
LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, query, errbuf);
safe_delete_array(query);
return false; return false;
} }
safe_delete_array(query);
for( auto row = results.begin(); row != results.end(); ++row) {
proximity.ExploreID = atoi(row[0]);
proximity.MinX = atof(row[1]);
proximity.MaxX = atof(row[2]);
proximity.MinY = atof(row[3]);
proximity.MaxY = atof(row[4]);
proximity.MinZ = atof(row[5]);
proximity.MaxZ = atof(row[6]);
TaskProximities.push_back(proximity);
}
return true; return true;