diff --git a/common/database.cpp b/common/database.cpp index 05291b54b..6de980adb 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1594,7 +1594,7 @@ uint32 Database::GetGroupID(const char* name){ if (results.RowCount() == 0) { // Commenting this out until logging levels can prevent this from going to console - //Log(Logs::General, Logs::None,, "Character not in a group: [{}]", name); + //LogDebug(, "Character not in a group: [{}]", name); return 0; } diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 1c5b71fc0..1d579567f 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -294,9 +294,7 @@ bool Mob::CheckWillAggro(Mob *mob) { // Don't aggro new clients if we are already engaged unless PROX_AGGRO is set if (IsEngaged() && (!GetSpecialAbility(PROX_AGGRO) || (GetSpecialAbility(PROX_AGGRO) && !CombatRange(mob)))) { - Log(Logs::Moderate, Logs::Aggro, - "%s is in combat, and does not have prox_aggro, or does and is out of combat range with %s", - GetName(), mob->GetName()); + LogAggro("[{}] is in combat, and does not have prox_aggro, or does and is out of combat range with [{}]", GetName(), mob->GetName()); return false; } @@ -356,7 +354,7 @@ bool Mob::CheckWillAggro(Mob *mob) { { //FatherNiwtit: make sure we can see them. last since it is very expensive if(CheckLosFN(mob)) { - Log(Logs::Detail, Logs::Aggro, "Check aggro for %s target %s.", GetName(), mob->GetName()); + LogAggro("Check aggro for [{}] target [{}]", GetName(), mob->GetName()); return( mod_will_aggro(mob, this) ); } } @@ -388,18 +386,18 @@ bool Mob::CheckWillAggro(Mob *mob) { { //FatherNiwtit: make sure we can see them. last since it is very expensive if(CheckLosFN(mob)) { - Log(Logs::Detail, Logs::Aggro, "Check aggro for %s target %s.", GetName(), mob->GetName()); + LogAggro("Check aggro for [{}] target [{}]", GetName(), mob->GetName()); return( mod_will_aggro(mob, this) ); } } } - Log(Logs::Detail, Logs::Aggro, "Is In zone?:%d\n", mob->InZone()); - Log(Logs::Detail, Logs::Aggro, "Dist^2: %f\n", dist2); - Log(Logs::Detail, Logs::Aggro, "Range^2: %f\n", iAggroRange2); - Log(Logs::Detail, Logs::Aggro, "Faction: %d\n", fv); - Log(Logs::Detail, Logs::Aggro, "Int: %d\n", GetINT()); - Log(Logs::Detail, Logs::Aggro, "Con: %d\n", GetLevelCon(mob->GetLevel())); + LogAggro("Is In zone?:[{}]\n", mob->InZone()); + LogAggro("Dist^2: [{}]\n", dist2); + LogAggro("Range^2: [{}]\n", iAggroRange2); + LogAggro("Faction: [{}]\n", fv); + LogAggro("Int: [{}]\n", GetINT()); + LogAggro("Con: [{}]\n", GetLevelCon(mob->GetLevel())); return(false); } @@ -519,7 +517,7 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) { //Father Nitwit: make sure we can see them. if(mob->CheckLosFN(sender)) { #if (EQDEBUG>=5) - Log(Logs::General, Logs::None, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f", + LogDebug("AIYellForHelp(\"[{}]\",\"[{}]\") [{}] attacking [{}] Dist [{}] Z [{}]", sender->GetName(), attacker->GetName(), mob->GetName(), attacker->GetName(), DistanceSquared(mob->GetPosition(), sender->GetPosition()), std::abs(sender->GetZ()+mob->GetZ())); diff --git a/zone/attack.cpp b/zone/attack.cpp index 3ae41a394..b26f4cf16 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -3437,7 +3437,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const if (pet && !pet->IsFamiliar() && !pet->GetSpecialAbility(IMMUNE_AGGRO) && !pet->IsEngaged() && attacker && attacker != this && !attacker->IsCorpse() && !pet->IsGHeld() && !attacker->IsTrap()) { if (!pet->IsHeld()) { - Log(Logs::Detail, Logs::Aggro, "Sending pet %s into battle due to attack.", pet->GetName()); + LogAggro("Sending pet [{}] into battle due to attack", pet->GetName()); pet->AddToHateList(attacker, 1, 0, true, false, false, spell_id); pet->SetTarget(attacker); MessageString(Chat::NPCQuestSay, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName()); diff --git a/zone/client.cpp b/zone/client.cpp index 7db9bc6d0..a9a66d3e6 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -2327,7 +2327,7 @@ void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 plat SaveCurrency(); #if (EQDEBUG>=5) - Log(Logs::General, Logs::None, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", + LogDebug("Client::AddMoneyToPP() [{}] should have: plat:[{}] gold:[{}] silver:[{}] copper:[{}]", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); #endif } @@ -4915,14 +4915,14 @@ void Client::HandleLDoNOpen(NPC *target) { if(target->GetClass() != LDON_TREASURE) { - Log(Logs::General, Logs::None, "%s tried to open %s but %s was not a treasure chest.", + LogDebug("[{}] tried to open [{}] but [{}] was not a treasure chest", GetName(), target->GetName(), target->GetName()); return; } if(DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) { - Log(Logs::General, Logs::None, "%s tried to open %s but %s was out of range", + LogDebug("[{}] tried to open [{}] but [{}] was out of range", GetName(), target->GetName(), target->GetName()); Message(Chat::Red, "Treasure chest out of range."); return; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 0e4e266c5..11959b733 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1773,8 +1773,7 @@ void Client::Handle_OP_AcceptNewTask(const EQApplicationPacket *app) { if (app->size != sizeof(AcceptNewTask_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_AcceptNewTask expected %i got %i", - sizeof(AcceptNewTask_Struct), app->size); + LogDebug("Size mismatch in OP_AcceptNewTask expected [{}] got [{}]", sizeof(AcceptNewTask_Struct), app->size); DumpPacket(app); return; } @@ -2112,8 +2111,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app) { if (app->size != sizeof(Adventure_Sell_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch on OP_AdventureMerchantSell: got %u expected %u", - app->size, sizeof(Adventure_Sell_Struct)); + LogDebug("Size mismatch on OP_AdventureMerchantSell: got [{}] expected [{}]", app->size, sizeof(Adventure_Sell_Struct)); DumpPacket(app); return; } @@ -2918,8 +2916,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app) // Some clients this seems to nuke the charm text (ex. Adventurer's Stone) if (app->size != sizeof(AugmentInfo_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_AugmentInfo expected %i got %i", - sizeof(AugmentInfo_Struct), app->size); + LogDebug("Size mismatch in OP_AugmentInfo expected [{}] got [{}]", sizeof(AugmentInfo_Struct), app->size); DumpPacket(app); return; } @@ -3317,8 +3314,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app) // Although there are three different structs for OP_Bandolier, they are all the same size. // if (app->size != sizeof(BandolierCreate_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_Bandolier expected %i got %i", - sizeof(BandolierCreate_Struct), app->size); + LogDebug("Size mismatch in OP_Bandolier expected [{}] got [{}]", sizeof(BandolierCreate_Struct), app->size); DumpPacket(app); return; } @@ -3748,8 +3744,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app) if (app->size != sizeof(BlockedBuffs_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_BlockedBuffs expected %i got %i", - sizeof(BlockedBuffs_Struct), app->size); + LogDebug("Size mismatch in OP_BlockedBuffs expected [{}] got [{}]", sizeof(BlockedBuffs_Struct), app->size); DumpPacket(app); @@ -3970,8 +3965,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app) { if (app->size != sizeof(CancelTask_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_CancelTask expected %i got %i", - sizeof(CancelTask_Struct), app->size); + LogDebug("Size mismatch in OP_CancelTask expected [{}] got [{}]", sizeof(CancelTask_Struct), app->size); DumpPacket(app); return; } @@ -4221,8 +4215,7 @@ void Client::Handle_OP_ClearNPCMarks(const EQApplicationPacket *app) if (app->size != 0) { - Log(Logs::General, Logs::None, "Size mismatch in OP_ClearNPCMarks expected 0 got %i", - app->size); + LogDebug("Size mismatch in OP_ClearNPCMarks expected 0 got [{}]", app->size); DumpPacket(app); @@ -5114,8 +5107,7 @@ void Client::Handle_OP_DelegateAbility(const EQApplicationPacket *app) if (app->size != sizeof(DelegateAbility_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_DelegateAbility expected %i got %i", - sizeof(DelegateAbility_Struct), app->size); + LogDebug("Size mismatch in OP_DelegateAbility expected [{}] got [{}]", sizeof(DelegateAbility_Struct), app->size); DumpPacket(app); @@ -5388,8 +5380,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app) if (app->size != sizeof(DoGroupLeadershipAbility_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_DoGroupLeadershipAbility expected %i got %i", - sizeof(DoGroupLeadershipAbility_Struct), app->size); + LogDebug("Size mismatch in OP_DoGroupLeadershipAbility expected [{}] got [{}]", sizeof(DoGroupLeadershipAbility_Struct), app->size); DumpPacket(app); @@ -5440,8 +5431,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app) } default: - Log(Logs::General, Logs::None, "Got unhandled OP_DoGroupLeadershipAbility Ability: %d Parameter: %d", - dglas->Ability, dglas->Parameter); + LogDebug("Got unhandled OP_DoGroupLeadershipAbility Ability: [{}] Parameter: [{}]", dglas->Ability, dglas->Parameter); break; } } @@ -6227,8 +6217,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app) if (app->size < sizeof(GMSearchCorpse_Struct)) { - Log(Logs::General, Logs::None, "OP_GMSearchCorpse size lower than expected: got %u expected at least %u", - app->size, sizeof(GMSearchCorpse_Struct)); + LogDebug("OP_GMSearchCorpse size lower than expected: got [{}] expected at least [{}]", app->size, sizeof(GMSearchCorpse_Struct)); DumpPacket(app); return; } @@ -6880,8 +6869,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app) { if (app->size != sizeof(GroupUpdate_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch on OP_GroupUpdate: got %u expected %u", - app->size, sizeof(GroupUpdate_Struct)); + LogDebug("Size mismatch on OP_GroupUpdate: got [{}] expected [{}]", app->size, sizeof(GroupUpdate_Struct)); DumpPacket(app); return; } @@ -7878,8 +7866,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app) { if (app->size != sizeof(GuildStatus_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_GuildStatus expected %i got %i", - sizeof(GuildStatus_Struct), app->size); + LogDebug("Size mismatch in OP_GuildStatus expected [{}] got [{}]", sizeof(GuildStatus_Struct), app->size); DumpPacket(app); @@ -7935,8 +7922,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app) { if (app->size != sizeof(GuildUpdateURLAndChannel_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_GuildUpdateURLAndChannel expected %i got %i", - sizeof(GuildUpdateURLAndChannel_Struct), app->size); + LogDebug("Size mismatch in OP_GuildUpdateURLAndChannel expected [{}] got [{}]", sizeof(GuildUpdateURLAndChannel_Struct), app->size); DumpPacket(app); @@ -8052,8 +8038,7 @@ void Client::Handle_OP_HideCorpse(const EQApplicationPacket *app) // if (app->size != sizeof(HideCorpse_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_HideCorpse expected %i got %i", - sizeof(HideCorpse_Struct), app->size); + LogDebug("Size mismatch in OP_HideCorpse expected [{}] got [{}]", sizeof(HideCorpse_Struct), app->size); DumpPacket(app); @@ -10758,11 +10743,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app) { if (app->size != sizeof(PopupResponse_Struct)) { - Log(Logs::General, - Logs::None, - "Size mismatch in OP_PopupResponse expected %i got %i", - sizeof(PopupResponse_Struct), - app->size); + LogDebug("Size mismatch in OP_PopupResponse expected [{}] got [{}]", sizeof(PopupResponse_Struct), app->size); DumpPacket(app); return; @@ -10806,8 +10787,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app) void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app) { if (app->size != sizeof(MovePotionToBelt_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_PotionBelt expected %i got %i", - sizeof(MovePotionToBelt_Struct), app->size); + LogDebug("Size mismatch in OP_PotionBelt expected [{}] got [{}]", sizeof(MovePotionToBelt_Struct), app->size); DumpPacket(app); return; } @@ -10930,8 +10910,7 @@ void Client::Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *a // if (app->size != sizeof(PVPLeaderBoardDetailsRequest_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_PVPLeaderBoardDetailsRequest expected %i got %i", - sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size); + LogDebug("Size mismatch in OP_PVPLeaderBoardDetailsRequest expected [{}] got [{}]", sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size); DumpPacket(app); @@ -10957,8 +10936,7 @@ void Client::Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app) // if (app->size != sizeof(PVPLeaderBoardRequest_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_PVPLeaderBoardRequest expected %i got %i", - sizeof(PVPLeaderBoardRequest_Struct), app->size); + LogDebug("Size mismatch in OP_PVPLeaderBoardRequest expected [{}] got [{}]", sizeof(PVPLeaderBoardRequest_Struct), app->size); DumpPacket(app); @@ -11902,8 +11880,7 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app) if (app->size != sizeof(BlockedBuffs_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_RemoveBlockedBuffs expected %i got %i", - sizeof(BlockedBuffs_Struct), app->size); + LogDebug("Size mismatch in OP_RemoveBlockedBuffs expected [{}] got [{}]", sizeof(BlockedBuffs_Struct), app->size); DumpPacket(app); @@ -12087,8 +12064,7 @@ void Client::Handle_OP_RespawnWindow(const EQApplicationPacket *app) // if (app->size != 4) { - Log(Logs::General, Logs::None, "Size mismatch in OP_RespawnWindow expected %i got %i", - 4, app->size); + LogDebug("Size mismatch in OP_RespawnWindow expected [{}] got [{}]", 4, app->size); DumpPacket(app); return; } @@ -13629,8 +13605,7 @@ void Client::Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app) { if (app->size != sizeof(TaskHistoryRequest_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_TaskHistoryRequest expected %i got %i", - sizeof(TaskHistoryRequest_Struct), app->size); + LogDebug("Size mismatch in OP_TaskHistoryRequest expected [{}] got [{}]", sizeof(TaskHistoryRequest_Struct), app->size); DumpPacket(app); return; } @@ -14431,9 +14406,7 @@ void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app) void Client::Handle_OP_VetClaimRequest(const EQApplicationPacket *app) { if (app->size < sizeof(VeteranClaim)) { - Log(Logs::General, Logs::None, - "OP_VetClaimRequest size lower than expected: got %u expected at least %u", app->size, - sizeof(VeteranClaim)); + LogDebug("OP_VetClaimRequest size lower than expected: got [{}] expected at least [{}]", app->size, sizeof(VeteranClaim)); DumpPacket(app); return; } @@ -14463,8 +14436,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app) if (app->size != sizeof(VoiceMacroIn_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_VoiceMacroIn expected %i got %i", - sizeof(VoiceMacroIn_Struct), app->size); + LogDebug("Size mismatch in OP_VoiceMacroIn expected [{}] got [{}]", sizeof(VoiceMacroIn_Struct), app->size); DumpPacket(app); @@ -14482,8 +14454,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app) void Client::Handle_OP_UpdateAura(const EQApplicationPacket *app) { if (app->size != sizeof(AuraDestory_Struct)) { - Log(Logs::General, Logs::None, "Size mismatch in OP_UpdateAura expected %i got %i", - sizeof(AuraDestory_Struct), app->size); + LogDebug("Size mismatch in OP_UpdateAura expected [{}] got [{}]", sizeof(AuraDestory_Struct), app->size); return; } diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 1b17f6407..55fd8d0b9 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -607,7 +607,7 @@ bool Client::Process() { npc_scan_count++; } - Log(Logs::General, Logs::Aggro, "Checking Reverse Aggro (client->npc) scanned_npcs (%i)", npc_scan_count); + LogAggro("Checking Reverse Aggro (client->npc) scanned_npcs ([{}])", npc_scan_count); } if (client_state != CLIENT_LINKDEAD && (client_state == CLIENT_ERROR || client_state == DISCONNECTED || client_state == CLIENT_KICKED || !eqs->CheckState(ESTABLISHED))) diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 4aac33267..9e38c7214 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1231,22 +1231,18 @@ XS(XS_Client_MovePC) { THIS->MovePC(zoneID, x, y, z, heading); } else { if (THIS->IsMerc()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Merc reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Merc reference"); } #ifdef BOTS else if (THIS->IsBot()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Bot reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Bot reference"); } #endif else if (THIS->IsNPC()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePC) attempted to process a type NPC reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type NPC reference"); } else { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePC) attempted to process an Unknown type reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process an Unknown type reference"); } Perl_croak(aTHX_ "THIS is not of type Client"); @@ -1283,22 +1279,18 @@ XS(XS_Client_MovePCInstance) { THIS->MovePC(zoneID, instanceID, x, y, z, heading); } else { if (THIS->IsMerc()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Merc reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Merc reference"); } #ifdef BOTS else if (THIS->IsBot()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference"); } #endif else if (THIS->IsNPC()) { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type NPC reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type NPC reference"); } else { - Log(Logs::Detail, Logs::None, - "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process an Unknown type reference"); + LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process an Unknown type reference"); } Perl_croak(aTHX_ "THIS is not of type Client"); diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 05403ed33..c6ae6a621 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -423,7 +423,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) } } else { - Log(Logs::Detail, Logs::None, "[CLIENT] id=%i, playerineqstring=%i, playersinzonestring=%i. Dumping WhoAllReturnStruct:", + LogDebug("[CLIENT] id=[{}], playerineqstring=[{}], playersinzonestring=[{}]. Dumping WhoAllReturnStruct:", wars->id, wars->playerineqstring, wars->playersinzonestring); } } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index ef4e6e188..2577ae0cd 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -888,8 +888,7 @@ void ZoneDatabase::UpdateTraderItemCharges(int CharID, uint32 SerialNumber, int3 Charges, CharID, SerialNumber); auto results = QueryDatabase(query); if (!results.Success()) - Log(Logs::Detail, Logs::None, "[CLIENT] Failed to update charges for trader item: %i for char_id: %i, the error was: %s\n", - SerialNumber, CharID, results.ErrorMessage().c_str()); + LogDebug("[CLIENT] Failed to update charges for trader item: [{}] for char_id: [{}], the error was: [{}]\n", SerialNumber, CharID, results.ErrorMessage().c_str()); } @@ -1524,13 +1523,12 @@ bool ZoneDatabase::SaveCharacterBindPoint(uint32 character_id, const BindStruct "%u, %u, %f, %f, %f, %f, %i)", character_id, bind.zoneId, bind.instance_id, bind.x, bind.y, bind.z, bind.heading, bind_num); - Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterBindPoint for character ID: %i zone_id: %u " - "instance_id: %u position: %f %f %f %f bind_num: %u", + LogDebug("ZoneDatabase::SaveCharacterBindPoint for character ID: [{}] zone_id: [{}] instance_id: [{}] position: [{}] [{}] [{}] [{}] bind_num: [{}]", character_id, bind.zoneId, bind.instance_id, bind.x, bind.y, bind.z, bind.heading, bind_num); auto results = QueryDatabase(query); if (!results.RowsAffected()) - Log(Logs::General, Logs::None, "ERROR Bind Home Save: %s. %s", results.ErrorMessage().c_str(), + LogDebug("ERROR Bind Home Save: [{}]. [{}]", results.ErrorMessage().c_str(), query.c_str()); return true; diff --git a/zone/zoning.cpp b/zone/zoning.cpp index f73502f79..2fa94627f 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -530,7 +530,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z heading = m_pp.binds[0].heading; zonesummon_ignorerestrictions = 1; - Log(Logs::General, Logs::None, "Player %s has died and will be zoned to bind point in zone: %s at LOC x=%f, y=%f, z=%f, heading=%f", + LogDebug("Player [{}] has died and will be zoned to bind point in zone: [{}] at LOC x=[{}], y=[{}], z=[{}], heading=[{}]", GetName(), pZoneName, m_pp.binds[0].x, m_pp.binds[0].y, m_pp.binds[0].z, m_pp.binds[0].heading); break; case SummonPC: @@ -539,7 +539,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z SetHeading(heading); break; case Rewind: - Log(Logs::General, Logs::None, "%s has requested a /rewind from %f, %f, %f, to %f, %f, %f in %s", GetName(), + LogDebug("[{}] has requested a /rewind from [{}], [{}], [{}], to [{}], [{}], [{}] in [{}]", GetName(), m_Position.x, m_Position.y, m_Position.z, m_RewindLocation.x, m_RewindLocation.y, m_RewindLocation.z, zone->GetShortName()); m_ZoneSummonLocation = glm::vec3(x, y, z);