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

LoadMercTypes converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-18 21:01:27 -07:00
parent 87efd22394
commit e907ab4f3e
1 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zone/merc.cpp
View File

@ -5852,34 +5852,29 @@ void Client::SendMercAssignPacket(uint32 entityID, uint32 unk01, uint32 unk02) {
} }
void NPC::LoadMercTypes() { void NPC::LoadMercTypes() {
std::string errorMessage;
char* Query = 0;
char TempErrorMessageBuffer[MYSQL_ERRMSG_SIZE];
MYSQL_RES* DatasetResult;
MYSQL_ROW DataRow;
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "SELECT DISTINCT MTyp.dbstring, MTyp.clientversion FROM merc_merchant_entries MME, merc_merchant_template_entries MMTE, merc_types MTyp, merc_templates MTem WHERE MME.merchant_id = %i AND MME.merc_merchant_template_id = MMTE.merc_merchant_template_id AND MMTE.merc_template_id = MTem.merc_template_id AND MTem.merc_type_id = MTyp.merc_type_id;", GetNPCTypeID()), TempErrorMessageBuffer, &DatasetResult)) { std::string query = StringFormat("SELECT DISTINCT MTyp.dbstring, MTyp.clientversion "
errorMessage = std::string(TempErrorMessageBuffer); "FROM merc_merchant_entries MME, merc_merchant_template_entries MMTE, "
"merc_types MTyp, merc_templates MTem "
"WHERE MME.merchant_id = %i "
"AND MME.merc_merchant_template_id = MMTE.merc_merchant_template_id "
"AND MMTE.merc_template_id = MTem.merc_template_id "
"AND MTem.merc_type_id = MTyp.merc_type_id;", GetNPCTypeID());
auto results = database.QueryDatabase(query);
if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error in NPC::LoadMercTypes()");
return;
} }
else {
while(DataRow = mysql_fetch_row(DatasetResult)) { for (auto row = results.begin(); row != results.end(); ++row) {
MercType tempMercType; MercType tempMercType;
tempMercType.Type = atoi(DataRow[0]); tempMercType.Type = atoi(row[0]);
tempMercType.ClientVersion = atoi(DataRow[1]); tempMercType.ClientVersion = atoi(row[1]);
mercTypeList.push_back(tempMercType); mercTypeList.push_back(tempMercType);
} }
mysql_free_result(DatasetResult);
}
safe_delete_array(Query);
Query = 0;
if(!errorMessage.empty()) {
LogFile->write(EQEMuLog::Error, "Error in NPC::LoadMercTypes()");
}
} }
void NPC::LoadMercs(){ void NPC::LoadMercs(){