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

LoadNewMerchantData converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-20 15:36:46 -07:00
parent f0abaad84f
commit 01382e87a0
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zone/zone.cpp
View File

@ -451,13 +451,17 @@ void Zone::LoadTempMerchantData_result(MYSQL_RES* result) {
//there should prolly be a temp counterpart of this... //there should prolly be a temp counterpart of this...
void Zone::LoadNewMerchantData(uint32 merchantid){ void Zone::LoadNewMerchantData(uint32 merchantid){
char errbuf[MYSQL_ERRMSG_SIZE];
char *query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
std::list<MerchantList> merlist; std::list<MerchantList> merlist;
if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT item, slot, faction_required, level_required, alt_currency_cost, classes_required FROM merchantlist WHERE merchantid=%d", merchantid), errbuf, &result)) { std::string query = StringFormat("SELECT item, slot, faction_required, level_required, alt_currency_cost, "
while((row = mysql_fetch_row(result))) { "classes_required FROM merchantlist WHERE merchantid=%d", merchantid);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error in LoadNewMerchantData query '%s' %s", query.c_str(), results.ErrorMessage().c_str());
return;
}
for(auto row = results.begin(); row != results.end(); ++row) {
MerchantList ml; MerchantList ml;
ml.id = merchantid; ml.id = merchantid;
ml.item = atoul(row[0]); ml.item = atoul(row[0]);
@ -468,12 +472,8 @@ void Zone::LoadNewMerchantData(uint32 merchantid){
ml.classes_required = atoul(row[4]); ml.classes_required = atoul(row[4]);
merlist.push_back(ml); merlist.push_back(ml);
} }
merchanttable[merchantid] = merlist; merchanttable[merchantid] = merlist;
mysql_free_result(result);
}
else
LogFile->write(EQEMuLog::Error, "Error in LoadNewMerchantData query '%s' %s", query, errbuf);
safe_delete_array(query);
} }
void Zone::LoadMerchantData_result(MYSQL_RES* result) { void Zone::LoadMerchantData_result(MYSQL_RES* result) {