pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-25 04:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GetPEQZone converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-07-03 18:55:16 -07:00 committed by Arthur Ice
parent 2a19a3ced4
commit 5c8cd19477
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/database.cpp
View File

@ -1190,7 +1190,7 @@ bool Database::LoadZoneNames() {
if (!results.Success()) if (!results.Success())
{ {
std::cerr << "Error in LoadZoneNames query '" << query << "' " << errbuf << std::endl; std::cerr << "Error in LoadZoneNames query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query); safe_delete_array(query);
return false; return false;
} }
@ -1233,29 +1233,24 @@ const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) {
} }
uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){ uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){
char errbuf[MYSQL_ERRMSG_SIZE]; char *query = nullptr;
char *query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
int peqzone = 0;
if (RunQuery(query, MakeAnyLenString(&query, "SELECT peqzone from zone where zoneidnumber='%i' AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version), errbuf, &result)) auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT peqzone from zone where zoneidnumber='%i' AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version));
if (!results.Success())
{ {
if (mysql_num_rows(result) > 0) std::cerr << "Error in GetPEQZone query '" << query << "' " << results.ErrorMessage() << std::endl;
{
row = mysql_fetch_row(result);
peqzone = atoi(row[0]);
}
safe_delete_array(query); safe_delete_array(query);
mysql_free_result(result); return 0;
return peqzone;
}
else
{
std::cerr << "Error in GetPEQZone query '" << query << "' " << errbuf << std::endl;
} }
safe_delete_array(query); safe_delete_array(query);
return peqzone;
if (results.RowCount() == 0)
return 0;
auto row = results.begin();
return atoi(row[0]);
} }
bool Database::CheckNameFilter(const char* name, bool surname) bool Database::CheckNameFilter(const char* name, bool surname)