LoadZoneNames converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-07-03 18:51:24 -07:00 committed by Arthur Ice
parent 24d08857e8
commit 2a19a3ced4

View File

@ -1184,25 +1184,24 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
} }
bool Database::LoadZoneNames() { bool Database::LoadZoneNames() {
char errbuf[MYSQL_ERRMSG_SIZE]; char *query = nullptr;
char *query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
if (RunQuery(query, MakeAnyLenString(&query, "SELECT zoneidnumber, short_name FROM zone"), errbuf, &result)) { auto results = QueryDatabase(query,MakeAnyLenString(&query, "SELECT zoneidnumber, short_name FROM zone"));
safe_delete_array(query);
while ((row = mysql_fetch_row(result))) { if (!results.Success())
uint32 zoneid = atoi(row[0]); {
std::string zonename = row[1];
zonename_array.insert(std::pair<uint32,std::string>(zoneid,zonename));
}
}
else {
std::cerr << "Error in LoadZoneNames query '" << query << "' " << errbuf << std::endl; std::cerr << "Error in LoadZoneNames query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query); safe_delete_array(query);
return false; return false;
} }
mysql_free_result(result); safe_delete_array(query);
for (auto row= results.begin();row != results.end();++row)
{
uint32 zoneid = atoi(row[0]);
std::string zonename = row[1];
zonename_array.insert(std::pair<uint32,std::string>(zoneid,zonename));
}
return true; return true;
} }