LoadFactionValues converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-08-21 17:04:08 -07:00
parent 2e84781594
commit 2df823d2db

View File

@ -2334,22 +2334,19 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race
} }
bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map& val_list) { bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map& val_list) {
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = 0; std::string query = StringFormat("SELECT faction_id,current_value "
MYSQL_RES *result; "FROM faction_values "
if (RunQuery(query, MakeAnyLenString(&query, "SELECT faction_id,current_value FROM faction_values WHERE char_id = %i",char_id), errbuf, &result)) { "WHERE char_id = %i", char_id);
safe_delete_array(query); auto results = QueryDatabase(query);
bool ret = LoadFactionValues_result(result, val_list); if (!results.Success()) {
mysql_free_result(result); std::cerr << "Error in LoadFactionValues query '" << query << "' " << results.ErrorMessage() << std::endl;
return ret;
}
else {
std::cerr << "Error in LoadFactionValues query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
}
return false; return false;
} }
return LoadFactionValues_result(std::move(results), val_list);
}
bool ZoneDatabase::LoadFactionValues_result(MySQLRequestResult results, faction_map & val_list) { bool ZoneDatabase::LoadFactionValues_result(MySQLRequestResult results, faction_map & val_list) {
for (auto row = results.begin(); row != results.begin(); ++row) for (auto row = results.begin(); row != results.begin(); ++row)