diff --git a/zone/client.cpp b/zone/client.cpp index 319b076c9..cd62b3331 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -651,7 +651,7 @@ bool Client::SendAllPackets() { eqs->FastQueuePacket((EQApplicationPacket **)&cp->app, cp->ack_req); iterator.RemoveCurrent(); #if EQDEBUG >= 6 - LogFile->write(EQEmuLog::Normal, "Transmitting a packet"); + logger.Log(EQEmuLogSys::Normal, "Transmitting a packet"); #endif } return true; @@ -1918,7 +1918,7 @@ void Client::ReadBook(BookRequest_Struct *book) { if (booktxt2[0] != '\0') { #if EQDEBUG >= 6 - LogFile->write(EQEmuLog::Normal,"Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str()); + logger.Log(EQEmuLogSys::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str()); #endif EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct)); @@ -2371,7 +2371,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillUseTypes skillid, uint16 Save(); - LogFile->write(EQEmuLog::Normal, "Reset %s's caster specialization skills to 1. " + logger.Log(EQEmuLogSys::Normal, "Reset %s's caster specialization skills to 1. " "Too many specializations skills were above 50.", GetCleanName()); } diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 30e3d760b..c3f8ef6c0 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -9153,7 +9153,7 @@ void Client::Handle_OP_LoadSpellSet(const EQApplicationPacket *app) void Client::Handle_OP_Logout(const EQApplicationPacket *app) { - logger.LogDebug(EQEmuLogSys:EQEmuLogSys::Detail, "%s sent a logout packet.", GetName()); + logger.LogDebug(EQEmuLogSys::Detail, "%s sent a logout packet.", GetName()); SendLogoutPackets(); diff --git a/zone/command.cpp b/zone/command.cpp index d77279e09..5d9cfe942 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -570,7 +570,7 @@ int command_realdispatch(Client *c, const char *message) #ifdef COMMANDS_LOGGING if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) { - LogFile->write(EQEmuLog::Commands, "%s (%s) used command: %s (target=%s)", c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE"); + logger.Log(EQEmuLogSys::Commands, "%s (%s) used command: %s (target=%s)", c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE"); } #endif diff --git a/zone/doors.cpp b/zone/doors.cpp index 229bb3e4c..a4d3f80f2 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -645,7 +645,7 @@ int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) } bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) { - LogFile->write(EQEmuLog::Status, "Loading Doors from database..."); + logger.Log(EQEmuLogSys::Status, "Loading Doors from database..."); // Door tmpDoor; diff --git a/zone/embperl.cpp b/zone/embperl.cpp index e1f1612e6..52fe31826 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -11,6 +11,7 @@ Eglin #ifdef EMBPERL #include "../common/debug.h" +#include "../common/eqemu_logsys.h" #include #include #include diff --git a/zone/entity.cpp b/zone/entity.cpp index 0712d252b..ccc74629c 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -557,7 +557,7 @@ void EntityList::AddGroup(Group *group) uint32 gid = worldserver.NextGroupID(); if (gid == 0) { - LogFile->write(EQEmuLog::Error, + logger.Log(EQEmuLogSys::Error, "Unable to get new group ID from world server. group is going to be broken."); return; } @@ -586,7 +586,7 @@ void EntityList::AddRaid(Raid *raid) uint32 gid = worldserver.NextGroupID(); if (gid == 0) { - LogFile->write(EQEmuLog::Error, + logger.Log(EQEmuLogSys::Error, "Unable to get new group ID from world server. group is going to be broken."); return; } diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index a6dd26cbc..b8d67ddaa 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -4817,7 +4817,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo return 0; break; default: - LogFile->write(EQEmuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); + logger.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); } break; @@ -5156,7 +5156,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo //this spits up a lot of garbage when calculating spell focuses //since they have all kinds of extra effects on them. default: - LogFile->write(EQEmuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); + logger.Log(EQEmuLogSys::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); #endif } diff --git a/zone/spells.cpp b/zone/spells.cpp index 3f7d622b8..ff456fcbc 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -5040,7 +5040,7 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) { spells[buffs[i].spellid].base[j], spells[buffs[i].spellid].max[j], buffs[i].casterlevel, buffs[i].spellid); - LogFile->write(EQEmuLog::Normal, + logger.Log(EQEmuLogSys::Normal, "FindType: type = %d; value = %d; threshold = %d", type, value, threshold); if (value < threshold) diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 1b3f9cec3..61cbaaada 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -2696,7 +2696,7 @@ int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid) bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid) { - LogFile->write(EQEmuLog::Status, "Loading Blocked Spells from database..."); + logger.Log(EQEmuLogSys::Status, "Loading Blocked Spells from database..."); std::string query = StringFormat("SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message " "FROM blocked_spells WHERE zoneid = %d ORDER BY id ASC", zoneid); diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 1d50ed51d..d6df3a896 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -347,7 +347,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc if(this->GetPet()) entity_list.RemoveFromHateLists(this->GetPet()); - LogFile->write(EQEmuLog::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z); + logger.Log(EQEmuLogSys::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z); //set the player's coordinates in the new zone so they have them //when they zone into it