From 31cebb579369e2aa064966b47afde3d41ff06c11 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 2 Sep 2019 02:18:54 -0500 Subject: [PATCH] Logs::Normal to LogInfo --- zone/bot.cpp | 2 +- zone/client.cpp | 2 +- zone/client_packet.cpp | 2 +- zone/command.cpp | 39 ++++++++++++++++++--------------------- zone/exp.cpp | 2 +- zone/npc.cpp | 2 +- zone/tradeskills.cpp | 2 +- zone/zone.cpp | 4 ++-- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index b309e71bf..e7d85e7c3 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -5054,7 +5054,7 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel return 0; break; default: - Log(Logs::General, Logs::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); + LogInfo("CalcFocusEffect: unknown limit spelltype [{}]", focus_spell.base[i]); } break; diff --git a/zone/client.cpp b/zone/client.cpp index 716505e8e..d4b839071 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -2067,7 +2067,7 @@ void Client::ReadBook(BookRequest_Struct *book) { if (booktxt2[0] != '\0') { #if EQDEBUG >= 6 - Log(Logs::General, Logs::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str()); + LogInfo("Client::ReadBook() textfile:[{}] Text:[{}]", txtfile, booktxt2.c_str()); #endif auto outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct)); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index b49febc6b..3acfb7b38 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -4510,7 +4510,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) { ); if (is_client_moving && is_ready_to_update) { - Log(Logs::Detail, Logs::Normal, "[%s] Client Zone Wide Position Update NPCs", GetCleanName()); + LogInfo("[[{}]] Client Zone Wide Position Update NPCs", GetCleanName()); auto &mob_movement_manager = MobMovementManager::Get(); auto &mob_list = entity_list.GetMobList(); diff --git a/zone/command.cpp b/zone/command.cpp index 162fe06ac..83a76fbb5 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1376,7 +1376,7 @@ void command_viewpetition(Client *c, const Seperator *sep) if (!results.Success()) return; - Log(Logs::General, Logs::Normal, "View petition request from %s, petition number: %i", c->GetName(), atoi(sep->argplus[1]) ); + LogInfo("View petition request from [{}], petition number: [{}]", c->GetName(), atoi(sep->argplus[1]) ); if (results.RowCount() == 0) { c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again."); @@ -1401,7 +1401,7 @@ void command_petitioninfo(Client *c, const Seperator *sep) if (!results.Success()) return; - Log(Logs::General, Logs::Normal, "Petition information request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) ); + LogInfo("Petition information request from [{}], petition number:", c->GetName(), atoi(sep->argplus[1]) ); if (results.RowCount() == 0) { c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again."); @@ -1427,7 +1427,7 @@ void command_delpetition(Client *c, const Seperator *sep) if (!results.Success()) return; - Log(Logs::General, Logs::Normal, "Delete petition request from %s, petition number:", c->GetName(), atoi(sep->argplus[1]) ); + LogInfo("Delete petition request from [{}], petition number:", c->GetName(), atoi(sep->argplus[1]) ); } @@ -1913,7 +1913,7 @@ void command_permaclass(Client *c, const Seperator *sep) c->Message(Chat::White,"Target is not a client."); else { c->Message(Chat::White, "Setting %s's class...Sending to char select.", t->GetName()); - Log(Logs::General, Logs::Normal, "Class change request from %s for %s, requested class:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); + LogInfo("Class change request from [{}] for [{}], requested class:[{}]", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); t->SetBaseClass(atoi(sep->arg[1])); t->Save(); t->Kick("Class was changed."); @@ -1935,7 +1935,7 @@ void command_permarace(Client *c, const Seperator *sep) c->Message(Chat::White,"Target is not a client."); else { c->Message(Chat::White, "Setting %s's race - zone to take effect", t->GetName()); - Log(Logs::General, Logs::Normal, "Permanant race change request from %s for %s, requested race:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); + LogInfo("Permanant race change request from [{}] for [{}], requested race:[{}]", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); uint32 tmp = Mob::GetDefaultGender(atoi(sep->arg[1]), t->GetBaseGender()); t->SetBaseRace(atoi(sep->arg[1])); t->SetBaseGender(tmp); @@ -1959,7 +1959,7 @@ void command_permagender(Client *c, const Seperator *sep) c->Message(Chat::White,"Target is not a client."); else { c->Message(Chat::White, "Setting %s's gender - zone to take effect", t->GetName()); - Log(Logs::General, Logs::Normal, "Permanant gender change request from %s for %s, requested gender:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); + LogInfo("Permanant gender change request from [{}] for [{}], requested gender:[{}]", c->GetName(), t->GetName(), atoi(sep->arg[1]) ); t->SetBaseGender(atoi(sep->arg[1])); t->Save(); t->SendIllusionPacket(atoi(sep->arg[1])); @@ -2298,7 +2298,7 @@ void command_dbspawn2(Client *c, const Seperator *sep) { if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) { - Log(Logs::General, Logs::Normal, "Spawning database spawn"); + LogInfo("Spawning database spawn"); uint16 cond = 0; int16 cond_min = 0; if(sep->IsNumber(4)) { @@ -2707,7 +2707,7 @@ void command_setlanguage(Client *c, const Seperator *sep) } else { - Log(Logs::General, Logs::Normal, "Set language request from %s, target:%s lang_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); + LogInfo("Set language request from [{}], target:[{}] lang_id:[{}] value:[{}]", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); uint8 langid = (uint8)atoi(sep->arg[1]); uint8 value = (uint8)atoi(sep->arg[2]); c->GetTarget()->CastToClient()->SetLanguageSkill( langid, value ); @@ -2732,7 +2732,7 @@ void command_setskill(Client *c, const Seperator *sep) c->Message(Chat::White, " x = 0 to %d", HIGHEST_CAN_SET_SKILL); } else { - Log(Logs::General, Logs::Normal, "Set skill request from %s, target:%s skill_id:%i value:%i", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); + LogInfo("Set skill request from [{}], target:[{}] skill_id:[{}] value:[{}]", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); int skill_num = atoi(sep->arg[1]); uint16 skill_value = atoi(sep->arg[2]); if (skill_num <= EQEmu::skills::HIGHEST_SKILL) @@ -2752,7 +2752,7 @@ void command_setskillall(Client *c, const Seperator *sep) } else { if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) { - Log(Logs::General, Logs::Normal, "Set ALL skill request from %s, target:%s", c->GetName(), c->GetTarget()->GetName()); + LogInfo("Set ALL skill request from [{}], target:[{}]", c->GetName(), c->GetTarget()->GetName()); uint16 level = atoi(sep->arg[1]); for (EQEmu::skills::SkillType skill_num = EQEmu::skills::Skill1HBlunt; skill_num <= EQEmu::skills::HIGHEST_SKILL; skill_num = (EQEmu::skills::SkillType)(skill_num + 1)) { c->GetTarget()->CastToClient()->SetSkill(skill_num, level); @@ -4150,7 +4150,7 @@ void command_listpetition(Client *c, const Seperator *sep) if (!results.Success()) return; - Log(Logs::General, Logs::Normal, "Petition list requested by %s", c->GetName()); + LogInfo("Petition list requested by [{}]", c->GetName()); if (results.RowCount() == 0) return; @@ -4884,7 +4884,7 @@ void command_lastname(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient()) t=c->GetTarget()->CastToClient(); - Log(Logs::General, Logs::Normal, "#lastname request from %s for %s", c->GetName(), t->GetName()); + LogInfo("#lastname request from [{}] for [{}]", c->GetName(), t->GetName()); if(strlen(sep->arg[1]) <= 70) t->ChangeLastName(sep->arg[1]); @@ -5968,12 +5968,9 @@ void command_guild(Client *c, const Seperator *sep) } if(guild_id == GUILD_NONE) { - Log(Logs::Detail, Logs::Guilds, "%s: Removing %s (%d) from guild with GM command.", c->GetName(), - sep->arg[2], charid); + Log(Logs::Detail, Logs::Guilds, "%s: Removing %s (%d) from guild with GM command.", c->GetName(), sep->arg[2], charid); } else { - Log(Logs::Detail, Logs::Guilds, "%s: Putting %s (%d) into guild %s (%d) with GM command.", c->GetName(), - sep->arg[2], charid, - guild_mgr.GetGuildName(guild_id), guild_id); + Log(Logs::Detail, Logs::Guilds, "%s: Putting %s (%d) into guild %s (%d) with GM command.", c->GetName(), sep->arg[2], charid, guild_mgr.GetGuildName(guild_id), guild_id); } if(!guild_mgr.SetGuild(charid, guild_id, GUILD_MEMBER)) { @@ -6641,7 +6638,7 @@ void command_scribespells(Client *c, const Seperator *sep) t->Message(Chat::White, "Scribing spells to spellbook."); if(t != c) c->Message(Chat::White, "Scribing spells for %s.", t->GetName()); - Log(Logs::General, Logs::Normal, "Scribe spells request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level); + LogInfo("Scribe spells request for [{}] from [{}], levels: [{}] -> [{}]", t->GetName(), c->GetName(), min_level, max_level); int book_slot = t->GetNextAvailableSpellBookSlot(); int spell_id = 0; @@ -6735,7 +6732,7 @@ void command_scribespell(Client *c, const Seperator *sep) { if(t != c) c->Message(Chat::White, "Scribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName()); - Log(Logs::General, Logs::Normal, "Scribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); + LogInfo("Scribe spell: [{}] ([{}]) request for [{}] from [{}]", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); if (spells[spell_id].classes[WARRIOR] != 0 && spells[spell_id].skill != 52 && spells[spell_id].classes[t->GetPP().class_ - 1] > 0 && !IsDiscipline(spell_id)) { book_slot = t->GetNextAvailableSpellBookSlot(); @@ -6782,7 +6779,7 @@ void command_unscribespell(Client *c, const Seperator *sep) { if(t != c) c->Message(Chat::White, "Unscribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName()); - Log(Logs::General, Logs::Normal, "Unscribe spell: %s (%i) request for %s from %s.", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); + LogInfo("Unscribe spell: [{}] ([{}]) request for [{}] from [{}]", spells[spell_id].name, spell_id, t->GetName(), c->GetName()); } else { t->Message(Chat::Red, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.", spells[spell_id].name, spell_id); @@ -9268,7 +9265,7 @@ void command_traindisc(Client *c, const Seperator *sep) t->Message(Chat::White, "Training disciplines"); if(t != c) c->Message(Chat::White, "Training disciplines for %s.", t->GetName()); - Log(Logs::General, Logs::Normal, "Train disciplines request for %s from %s, levels: %u -> %u", t->GetName(), c->GetName(), min_level, max_level); + LogInfo("Train disciplines request for [{}] from [{}], levels: [{}] -> [{}]", t->GetName(), c->GetName(), min_level, max_level); int spell_id = 0; int count = 0; diff --git a/zone/exp.cpp b/zone/exp.cpp index 3bbc8cfae..e70e8e936 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -823,7 +823,7 @@ void Client::SetLevel(uint8 set_level, bool command) safe_delete(outapp); this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change - Log(Logs::General, Logs::Normal, "Setting Level for %s to %i", GetName(), set_level); + LogInfo("Setting Level for [{}] to [{}]", GetName(), set_level); CalcBonuses(); diff --git a/zone/npc.cpp b/zone/npc.cpp index 62e579677..2e81653f5 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -1903,7 +1903,7 @@ void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool rem { if(database.SetSpecialAttkFlag(this->GetNPCTypeID(), orig_parse)) { - Log(Logs::General, Logs::Normal, "NPCTypeID: %i flagged to '%s' for Special Attacks.\n",this->GetNPCTypeID(),orig_parse); + LogInfo("NPCTypeID: [{}] flagged to [{}] for Special Attacks.\n",this->GetNPCTypeID(),orig_parse); } } } diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index cb48a500c..e13bf428f 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -1400,7 +1400,7 @@ void Client::LearnRecipe(uint32 recipeID) } if (results.RowCount() != 1) { - Log(Logs::General, Logs::Normal, "Client::LearnRecipe - RecipeID: %d had %d occurences.", recipeID, results.RowCount()); + LogInfo("Client::LearnRecipe - RecipeID: [{}] had [{}] occurences", recipeID, results.RowCount()); return; } diff --git a/zone/zone.cpp b/zone/zone.cpp index 14b7503e2..2d51633bb 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -144,7 +144,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { delete pack; } - Log(Logs::General, Logs::Normal, "---- Zone server %s, listening on port:%i ----", zonename, ZoneConfig::get()->ZonePort); + LogInfo("---- Zone server [{}], listening on port:[{}] ----", zonename, ZoneConfig::get()->ZonePort); LogInfo("Zone Bootup: [{}] ([{}]: [{}])", zonename, iZoneID, iInstanceID); parse->Init(); UpdateWindowTitle(); @@ -718,7 +718,7 @@ void Zone::Shutdown(bool quite) petition_list.ClearPetitions(); zone->SetZoneHasCurrentTime(false); if (!quite) - Log(Logs::General, Logs::Normal, "Zone shutdown: going to sleep"); + LogInfo("Zone shutdown: going to sleep"); is_zone_loaded = false; zone->ResetAuth();