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

LoadMercTemplates converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-20 15:53:02 -07:00
parent 01382e87a0
commit 7a3c05a41f
1 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
zone/zone.cpp
View File

@ -541,75 +541,69 @@ void Zone::GetMerchantDataForZoneLoad(){
void Zone::LoadMercTemplates(){ void Zone::LoadMercTemplates(){
std::string errorMessage;
char* Query = 0;
char TempErrorMessageBuffer[MYSQL_ERRMSG_SIZE];
MYSQL_RES* DatasetResult;
MYSQL_ROW DataRow;
std::list<MercStanceInfo> merc_stances; std::list<MercStanceInfo> merc_stances;
merc_templates.clear(); merc_templates.clear();
std::string query = "SELECT `class_id`, `proficiency_id`, `stance_id`, `isdefault` FROM "
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "SELECT `class_id`, `proficiency_id`, `stance_id`, `isdefault` FROM `merc_stance_entries` order by `class_id`, `proficiency_id`, `stance_id`"), TempErrorMessageBuffer, &DatasetResult)) { "`merc_stance_entries` ORDER BY `class_id`, `proficiency_id`, `stance_id`";
errorMessage = std::string(TempErrorMessageBuffer); auto results = database.QueryDatabase(query);
} if (!results.Success())
LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadMercTemplates()");
else { else {
while(DataRow = mysql_fetch_row(DatasetResult)) { for (auto row = results.begin(); row != results.end(); ++row) {
MercStanceInfo tempMercStanceInfo; MercStanceInfo tempMercStanceInfo;
tempMercStanceInfo.ClassID = atoi(DataRow[0]); tempMercStanceInfo.ClassID = atoi(row[0]);
tempMercStanceInfo.ProficiencyID = atoi(DataRow[1]); tempMercStanceInfo.ProficiencyID = atoi(row[1]);
tempMercStanceInfo.StanceID = atoi(DataRow[2]); tempMercStanceInfo.StanceID = atoi(row[2]);
tempMercStanceInfo.IsDefault = atoi(DataRow[3]); tempMercStanceInfo.IsDefault = atoi(row[3]);
merc_stances.push_back(tempMercStanceInfo); merc_stances.push_back(tempMercStanceInfo);
} }
mysql_free_result(DatasetResult);
} }
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "SELECT DISTINCT MTem.merc_template_id, MTyp.dbstring AS merc_type_id, MTem.dbstring AS merc_subtype_id, MTyp.race_id, MS.class_id, MTyp.proficiency_id, MS.tier_id, 0 AS CostFormula, MTem.clientversion, MTem.merc_npc_type_id FROM merc_types MTyp, merc_templates MTem, merc_subtypes MS WHERE MTem.merc_type_id = MTyp.merc_type_id AND MTem.merc_subtype_id = MS.merc_subtype_id ORDER BY MTyp.race_id, MS.class_id, MTyp.proficiency_id;"), TempErrorMessageBuffer, &DatasetResult)) { query = "SELECT DISTINCT MTem.merc_template_id, MTyp.dbstring "
errorMessage = std::string(TempErrorMessageBuffer); "AS merc_type_id, MTem.dbstring "
} "AS merc_subtype_id, MTyp.race_id, MS.class_id, MTyp.proficiency_id, MS.tier_id, 0 "
else { "AS CostFormula, MTem.clientversion, MTem.merc_npc_type_id "
while(DataRow = mysql_fetch_row(DatasetResult)) { "FROM merc_types MTyp, merc_templates MTem, merc_subtypes MS "
int stanceIndex = 0; "WHERE MTem.merc_type_id = MTyp.merc_type_id AND MTem.merc_subtype_id = MS.merc_subtype_id "
MercTemplate tempMercTemplate; "ORDER BY MTyp.race_id, MS.class_id, MTyp.proficiency_id;";
results = database.QueryDatabase(query);
tempMercTemplate.MercTemplateID = atoi(DataRow[0]); if (!results.Success()) {
tempMercTemplate.MercType = atoi(DataRow[1]); LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadMercTemplates()");
tempMercTemplate.MercSubType = atoi(DataRow[2]); return;
tempMercTemplate.RaceID = atoi(DataRow[3]);
tempMercTemplate.ClassID = atoi(DataRow[4]);
tempMercTemplate.ProficiencyID = atoi(DataRow[5]);
tempMercTemplate.TierID = atoi(DataRow[6]);
tempMercTemplate.CostFormula = atoi(DataRow[7]);
tempMercTemplate.ClientVersion = atoi(DataRow[8]);
tempMercTemplate.MercNPCID = atoi(DataRow[9]);
for(int i = 0; i < MaxMercStanceID; i++) {
tempMercTemplate.Stances[i] = 0;
}
for (std::list<MercStanceInfo>::iterator mercStanceListItr = merc_stances.begin(); mercStanceListItr != merc_stances.end(); ++mercStanceListItr) {
if(mercStanceListItr->ClassID == tempMercTemplate.ClassID && mercStanceListItr->ProficiencyID == tempMercTemplate.ProficiencyID) {
zone->merc_stance_list[tempMercTemplate.MercTemplateID].push_back((*mercStanceListItr));
tempMercTemplate.Stances[stanceIndex] = mercStanceListItr->StanceID;
stanceIndex++;
}
}
merc_templates[tempMercTemplate.MercTemplateID] = tempMercTemplate;
}
mysql_free_result(DatasetResult);
} }
safe_delete_array(Query); for (auto row = results.begin(); row != results.end(); ++row) {
Query = 0;
MercTemplate tempMercTemplate;
tempMercTemplate.MercTemplateID = atoi(row[0]);
tempMercTemplate.MercType = atoi(row[1]);
tempMercTemplate.MercSubType = atoi(row[2]);
tempMercTemplate.RaceID = atoi(row[3]);
tempMercTemplate.ClassID = atoi(row[4]);
tempMercTemplate.ProficiencyID = atoi(row[5]);
tempMercTemplate.TierID = atoi(row[6]);
tempMercTemplate.CostFormula = atoi(row[7]);
tempMercTemplate.ClientVersion = atoi(row[8]);
tempMercTemplate.MercNPCID = atoi(row[9]);
for(int i = 0; i < MaxMercStanceID; i++)
tempMercTemplate.Stances[i] = 0;
int stanceIndex = 0;
for (std::list<MercStanceInfo>::iterator mercStanceListItr = merc_stances.begin(); mercStanceListItr != merc_stances.end(); ++mercStanceListItr, ++stanceIndex) {
if(mercStanceListItr->ClassID != tempMercTemplate.ClassID || mercStanceListItr->ProficiencyID != tempMercTemplate.ProficiencyID)
continue;
zone->merc_stance_list[tempMercTemplate.MercTemplateID].push_back((*mercStanceListItr));
tempMercTemplate.Stances[stanceIndex] = mercStanceListItr->StanceID;
}
merc_templates[tempMercTemplate.MercTemplateID] = tempMercTemplate;
}
if(!errorMessage.empty()) {
LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadMercTemplates()");
}
} }