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

LoadNPCEmotes converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-20 16:31:05 -07:00
parent cee4a3f475
commit 029314ec7f
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zone/zone.cpp
View File

@ -2265,15 +2265,16 @@ 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()) {
LogFile->write(EQEMuLog::Error, "Error in Zone::LoadNPCEmotes: %s (%s)", query.c_str(), results.ErrorMessage().c_str());
return;
}
for (auto row = results.begin(); row != results.end(); ++row)
{ {
NPC_Emote_Struct* nes = new NPC_Emote_Struct; NPC_Emote_Struct* nes = new NPC_Emote_Struct;
nes->emoteid = atoi(row[0]); nes->emoteid = atoi(row[0]);
@ -2282,14 +2283,7 @@ void Zone::LoadNPCEmotes(LinkedList<NPC_Emote_Struct*>* NPCEmoteList)
strn0cpy(nes->text, row[3], sizeof(nes->text)); strn0cpy(nes->text, row[3], sizeof(nes->text));
NPCEmoteList->Insert(nes); NPCEmoteList->Insert(nes);
} }
mysql_free_result(result);
safe_delete_array(query);
}
else
{
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){