LoadNPCEmotes converted to QueryDatabase

This commit is contained in:
Arthur Ice 2014-08-20 16:31:05 -07:00
parent cee4a3f475
commit 029314ec7f

View File

@ -2265,31 +2265,25 @@ void Zone::DoAdventureActions()
void Zone::LoadNPCEmotes(LinkedList<NPC_Emote_Struct*>* NPCEmoteList) void Zone::LoadNPCEmotes(LinkedList<NPC_Emote_Struct*>* NPCEmoteList)
{ {
char errbuf[MYSQL_ERRMSG_SIZE];
char* query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
NPCEmoteList->Clear();
if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT emoteid, event_, type, text FROM npc_emotes"), errbuf, &result)) NPCEmoteList->Clear();
{ const std::string query = "SELECT emoteid, event_, type, text FROM npc_emotes";
while((row = mysql_fetch_row(result))) auto results = database.QueryDatabase(query);
{ if (!results.Success()) {
NPC_Emote_Struct* nes = new NPC_Emote_Struct; LogFile->write(EQEMuLog::Error, "Error in Zone::LoadNPCEmotes: %s (%s)", query.c_str(), results.ErrorMessage().c_str());
nes->emoteid = atoi(row[0]); return;
nes->event_ = atoi(row[1]); }
nes->type = atoi(row[2]);
strn0cpy(nes->text, row[3], sizeof(nes->text)); for (auto row = results.begin(); row != results.end(); ++row)
NPCEmoteList->Insert(nes); {
} NPC_Emote_Struct* nes = new NPC_Emote_Struct;
mysql_free_result(result); nes->emoteid = atoi(row[0]);
safe_delete_array(query); nes->event_ = atoi(row[1]);
} nes->type = atoi(row[2]);
else strn0cpy(nes->text, row[3], sizeof(nes->text));
{ NPCEmoteList->Insert(nes);
LogFile->write(EQEMuLog::Error, "Error in Zone::LoadNPCEmotes: %s (%s)", query, errbuf); }
safe_delete_array(query);
}
} }
void Zone::ReloadWorld(uint32 Option){ void Zone::ReloadWorld(uint32 Option){