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

Revert "LoadFactionValues converted to QueryDatabase"

Browse Source 
This reverts commit 2df823d2dbb96ac159f14243070834b5927b33d2.
This commit is contained in:
Michael Cook (mackal) 2014-09-11 16:56:15 -04:00
parent c94ceb5b1d
commit 6bc4ecf390
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zone/zonedb.cpp
View File

@ -2336,18 +2336,21 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race
return true; return true;
} }
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];
std::string query = StringFormat("SELECT faction_id,current_value " char *query = 0;
"FROM faction_values " MYSQL_RES *result;
"WHERE char_id = %i", char_id); if (RunQuery(query, MakeAnyLenString(&query, "SELECT faction_id,current_value FROM faction_values WHERE char_id = %i",char_id), errbuf, &result)) {
auto results = QueryDatabase(query); safe_delete_array(query);
if (!results.Success()) { bool ret = LoadFactionValues_result(result, val_list);
std::cerr << "Error in LoadFactionValues query '" << query << "' " << results.ErrorMessage() << std::endl; mysql_free_result(result);
return false; return ret;
} }
else {
return LoadFactionValues_result(std::move(results), val_list); std::cerr << "Error in LoadFactionValues query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
}
return false;
} }
bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list) { bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list) {