pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-01 21:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate EQEmuLogsys::Debug General calls into DebugCategory

Browse Source
This commit is contained in:
Akkadius 2015-01-18 00:00:03 -06:00
parent d45ed9befa
commit 58d0b86a67
21 changed files with 155 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/aggro.cpp
View File

@ -466,7 +466,7 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) {
//Father Nitwit: make sure we can see them. //Father Nitwit: make sure we can see them.
if(mob->CheckLosFN(sender)) { if(mob->CheckLosFN(sender)) {
#if (EQDEBUG>=5) #if (EQDEBUG>=5)
logger.LogDebug(EQEmuLogSys::General, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f",
sender->GetName(), attacker->GetName(), mob->GetName(), attacker->GetName(), mob->DistNoRoot(*sender), fabs(sender->GetZ()+mob->GetZ())); sender->GetName(), attacker->GetName(), mob->GetName(), attacker->GetName(), mob->DistNoRoot(*sender), fabs(sender->GetZ()+mob->GetZ()));
#endif #endif
mob->AddToHateList(attacker, 1, 0, false); mob->AddToHateList(attacker, 1, 0, false);
@ -693,7 +693,7 @@ type', in which case, the answer is yes.
} }
while( reverse++ == 0 ); while( reverse++ == 0 );
logger.LogDebug(EQEmuLogSys::General, "Mob::IsAttackAllowed: don't have a rule for this - %s vs %s\n", this->GetName(), target->GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Mob::IsAttackAllowed: don't have a rule for this - %s vs %s\n", this->GetName(), target->GetName());
return false; return false;
} }
@ -833,7 +833,7 @@ bool Mob::IsBeneficialAllowed(Mob *target)
} }
while( reverse++ == 0 ); while( reverse++ == 0 );
logger.LogDebug(EQEmuLogSys::General, "Mob::IsBeneficialAllowed: don't have a rule for this - %s to %s\n", this->GetName(), target->GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Mob::IsBeneficialAllowed: don't have a rule for this - %s to %s\n", this->GetName(), target->GetName());
return false; return false;
} }
@ -945,7 +945,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) {
oloc.z = posZ + (mobSize==0.0?LOS_DEFAULT_HEIGHT:mobSize)/2 * SEE_POSITION; oloc.z = posZ + (mobSize==0.0?LOS_DEFAULT_HEIGHT:mobSize)/2 * SEE_POSITION;
#if LOSDEBUG>=5 #if LOSDEBUG>=5
logger.LogDebug(EQEmuLogSys::General, "LOS from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f) sizes: (%.2f, %.2f)", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "LOS from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f) sizes: (%.2f, %.2f)", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize);
#endif #endif
return zone->zonemap->CheckLoS(myloc, oloc); return zone->zonemap->CheckLoS(myloc, oloc);
} }

2
zone/bot.cpp
View File

@ -8548,7 +8548,7 @@ int32 Bot::CalcMaxMana() {
} }
default: default:
{ {
logger.LogDebug(EQEmuLogSys::General, "Invalid Class '%c' in CalcMaxMana", GetCasterClass()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
max_mana = 0; max_mana = 0;
break; break;
} }

32
zone/client.cpp
View File

@ -340,7 +340,7 @@ Client::~Client() {
ToggleBuyerMode(false); ToggleBuyerMode(false);
if(conn_state != ClientConnectFinished) { if(conn_state != ClientConnectFinished) {
logger.LogDebug(EQEmuLogSys::General, "Client '%s' was destroyed before reaching the connected state:", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client '%s' was destroyed before reaching the connected state:", GetName());
ReportConnectingState(); ReportConnectingState();
} }
@ -438,31 +438,31 @@ void Client::SendLogoutPackets() {
void Client::ReportConnectingState() { void Client::ReportConnectingState() {
switch(conn_state) { switch(conn_state) {
case NoPacketsReceived: //havent gotten anything case NoPacketsReceived: //havent gotten anything
logger.LogDebug(EQEmuLogSys::General, "Client has not sent us an initial zone entry packet."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client has not sent us an initial zone entry packet.");
break; break;
case ReceivedZoneEntry: //got the first packet, loading up PP case ReceivedZoneEntry: //got the first packet, loading up PP
logger.LogDebug(EQEmuLogSys::General, "Client sent initial zone packet, but we never got their player info from the database."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client sent initial zone packet, but we never got their player info from the database.");
break; break;
case PlayerProfileLoaded: //our DB work is done, sending it case PlayerProfileLoaded: //our DB work is done, sending it
logger.LogDebug(EQEmuLogSys::General, "We were sending the player profile, tributes, tasks, spawns, time and weather, but never finished."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "We were sending the player profile, tributes, tasks, spawns, time and weather, but never finished.");
break; break;
case ZoneInfoSent: //includes PP, tributes, tasks, spawns, time and weather case ZoneInfoSent: //includes PP, tributes, tasks, spawns, time and weather
logger.LogDebug(EQEmuLogSys::General, "We successfully sent player info and spawns, waiting for client to request new zone."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "We successfully sent player info and spawns, waiting for client to request new zone.");
break; break;
case NewZoneRequested: //received and sent new zone request case NewZoneRequested: //received and sent new zone request
logger.LogDebug(EQEmuLogSys::General, "We received client's new zone request, waiting for client spawn request."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "We received client's new zone request, waiting for client spawn request.");
break; break;
case ClientSpawnRequested: //client sent ReqClientSpawn case ClientSpawnRequested: //client sent ReqClientSpawn
logger.LogDebug(EQEmuLogSys::General, "We received the client spawn request, and were sending objects, doors, zone points and some other stuff, but never finished."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "We received the client spawn request, and were sending objects, doors, zone points and some other stuff, but never finished.");
break; break;
case ZoneContentsSent: //objects, doors, zone points case ZoneContentsSent: //objects, doors, zone points
logger.LogDebug(EQEmuLogSys::General, "The rest of the zone contents were successfully sent, waiting for client ready notification."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "The rest of the zone contents were successfully sent, waiting for client ready notification.");
break; break;
case ClientReadyReceived: //client told us its ready, send them a bunch of crap like guild MOTD, etc case ClientReadyReceived: //client told us its ready, send them a bunch of crap like guild MOTD, etc
logger.LogDebug(EQEmuLogSys::General, "We received client ready notification, but never finished Client::CompleteConnect"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "We received client ready notification, but never finished Client::CompleteConnect");
break; break;
case ClientConnectFinished: //client finally moved to finished state, were done here case ClientConnectFinished: //client finally moved to finished state, were done here
logger.LogDebug(EQEmuLogSys::General, "Client is successfully connected."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client is successfully connected.");
break; break;
}; };
} }
@ -2105,7 +2105,7 @@ void Client::AddMoneyToPP(uint64 copper, bool updateclient){
SaveCurrency(); SaveCurrency();
logger.LogDebug(EQEmuLogSys::General, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper);
} }
void Client::EVENT_ITEM_ScriptStopReturn(){ void Client::EVENT_ITEM_ScriptStopReturn(){
@ -2145,7 +2145,7 @@ void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 plat
SaveCurrency(); SaveCurrency();
#if (EQDEBUG>=5) #if (EQDEBUG>=5)
logger.LogDebug(EQEmuLogSys::General, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i",
GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper);
#endif #endif
} }
@ -4544,14 +4544,14 @@ void Client::HandleLDoNOpen(NPC *target)
{ {
if(target->GetClass() != LDON_TREASURE) if(target->GetClass() != LDON_TREASURE)
{ {
logger.LogDebug(EQEmuLogSys::General, "%s tried to open %s but %s was not a treasure chest.", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "%s tried to open %s but %s was not a treasure chest.",
GetName(), target->GetName(), target->GetName()); GetName(), target->GetName(), target->GetName());
return; return;
} }
if(DistNoRootNoZ(*target) > RuleI(Adventure, LDoNTrapDistanceUse)) if(DistNoRootNoZ(*target) > RuleI(Adventure, LDoNTrapDistanceUse))
{ {
logger.LogDebug(EQEmuLogSys::General, "%s tried to open %s but %s was out of range", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "%s tried to open %s but %s was out of range",
GetName(), target->GetName(), target->GetName()); GetName(), target->GetName(), target->GetName());
Message(13, "Treasure chest out of range."); Message(13, "Treasure chest out of range.");
return; return;
@ -8149,7 +8149,7 @@ void Client::Consume(const Item_Struct *item, uint8 type, int16 slot, bool auto_
entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name); entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "Eating from slot:%i", (int)slot); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Eating from slot:%i", (int)slot);
#endif #endif
} }
else else
@ -8166,7 +8166,7 @@ void Client::Consume(const Item_Struct *item, uint8 type, int16 slot, bool auto_
entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name); entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "Drinking from slot:%i", (int)slot); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Drinking from slot:%i", (int)slot);
#endif #endif
} }
} }

8
zone/client_mods.cpp
View File

@ -935,7 +935,7 @@ int32 Client::CalcMaxMana()
break; break;
} }
default: { default: {
logger.LogDebug(EQEmuLogSys::General, "Invalid Class '%c' in CalcMaxMana", GetCasterClass()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
max_mana = 0; max_mana = 0;
break; break;
} }
@ -956,7 +956,7 @@ int32 Client::CalcMaxMana()
} }
#if EQDEBUG >= 11 #if EQDEBUG >= 11
logger.LogDebug(EQEmuLogSys::General, "Client::CalcMaxMana() called for %s - returning %d", GetName(), max_mana); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client::CalcMaxMana() called for %s - returning %d", GetName(), max_mana);
#endif #endif
return max_mana; return max_mana;
} }
@ -1046,14 +1046,14 @@ int32 Client::CalcBaseMana()
break; break;
} }
default: { default: {
logger.LogDebug(EQEmuLogSys::General, "Invalid Class '%c' in CalcMaxMana", GetCasterClass()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
max_m = 0; max_m = 0;
break; break;
} }
} }
#if EQDEBUG >= 11 #if EQDEBUG >= 11
logger.LogDebug(EQEmuLogSys::General, "Client::CalcBaseMana() called for %s - returning %d", GetName(), max_m); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client::CalcBaseMana() called for %s - returning %d", GetName(), max_m);
#endif #endif
return max_m; return max_m;
} }

160
zone/client_packet.cpp
View File

@ -483,7 +483,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
case CLIENT_LINKDEAD: case CLIENT_LINKDEAD:
break; break;
default: default:
logger.LogDebug(EQEmuLogSys::General, "Unknown client_state: %d\n", client_state); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Unknown client_state: %d\n", client_state);
break; break;
} }
@ -1317,7 +1317,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
ClientVersionBit = 0; ClientVersionBit = 0;
bool siv = m_inv.SetInventoryVersion(ClientVersion); bool siv = m_inv.SetInventoryVersion(ClientVersion);
logger.LogDebug(EQEmuLogSys::General, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), EQClientVersionName(ClientVersion), ClientVersion); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), EQClientVersionName(ClientVersion), ClientVersion);
/* Antighost code /* Antighost code
tmp var is so the search doesnt find this object tmp var is so the search doesnt find this object
@ -1940,7 +1940,7 @@ void Client::Handle_OP_AcceptNewTask(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(AcceptNewTask_Struct)) { if (app->size != sizeof(AcceptNewTask_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_AcceptNewTask expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_AcceptNewTask expected %i got %i",
sizeof(AcceptNewTask_Struct), app->size); sizeof(AcceptNewTask_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -2280,7 +2280,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Adventure_Sell_Struct)) if (app->size != sizeof(Adventure_Sell_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch on OP_AdventureMerchantSell: got %u expected %u", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch on OP_AdventureMerchantSell: got %u expected %u",
app->size, sizeof(Adventure_Sell_Struct)); app->size, sizeof(Adventure_Sell_Struct));
DumpPacket(app); DumpPacket(app);
return; return;
@ -2994,7 +2994,7 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
DeleteItemInInventory(ApplyPoisonData->inventorySlot, 1, true); DeleteItemInInventory(ApplyPoisonData->inventorySlot, 1, true);
logger.LogDebug(EQEmuLogSys::General, "Chance to Apply Poison was %f. Roll was %f. Result is %u.", SuccessChance, ChanceRoll, ApplyPoisonSuccessResult); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Chance to Apply Poison was %f. Roll was %f. Result is %u.", SuccessChance, ChanceRoll, ApplyPoisonSuccessResult);
} }
} }
@ -3009,7 +3009,7 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
void Client::Handle_OP_Assist(const EQApplicationPacket *app) void Client::Handle_OP_Assist(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(EntityId_Struct)) { if (app->size != sizeof(EntityId_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_Assist expected %i got %i", sizeof(EntityId_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_Assist expected %i got %i", sizeof(EntityId_Struct), app->size);
return; return;
} }
@ -3039,7 +3039,7 @@ void Client::Handle_OP_Assist(const EQApplicationPacket *app)
void Client::Handle_OP_AssistGroup(const EQApplicationPacket *app) void Client::Handle_OP_AssistGroup(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(EntityId_Struct)) { if (app->size != sizeof(EntityId_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_AssistGroup expected %i got %i", sizeof(EntityId_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_AssistGroup expected %i got %i", sizeof(EntityId_Struct), app->size);
return; return;
} }
QueuePacket(app); QueuePacket(app);
@ -3052,7 +3052,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app)
// Some clients this seems to nuke the charm text (ex. Adventurer's Stone) // Some clients this seems to nuke the charm text (ex. Adventurer's Stone)
if (app->size != sizeof(AugmentInfo_Struct)) { if (app->size != sizeof(AugmentInfo_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_AugmentInfo expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_AugmentInfo expected %i got %i",
sizeof(AugmentInfo_Struct), app->size); sizeof(AugmentInfo_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -3295,7 +3295,7 @@ void Client::Handle_OP_AutoAttack2(const EQApplicationPacket *app)
void Client::Handle_OP_AutoFire(const EQApplicationPacket *app) void Client::Handle_OP_AutoFire(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(bool)) { if (app->size != sizeof(bool)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_AutoFire expected %i got %i", sizeof(bool), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_AutoFire expected %i got %i", sizeof(bool), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -3311,7 +3311,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app)
// Although there are three different structs for OP_Bandolier, they are all the same size. // Although there are three different structs for OP_Bandolier, they are all the same size.
// //
if (app->size != sizeof(BandolierCreate_Struct)) { if (app->size != sizeof(BandolierCreate_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_Bandolier expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_Bandolier expected %i got %i",
sizeof(BandolierCreate_Struct), app->size); sizeof(BandolierCreate_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -3330,7 +3330,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app)
SetBandolier(app); SetBandolier(app);
break; break;
default: default:
logger.LogDebug(EQEmuLogSys::General, "Uknown Bandolier action %i", bs->action); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Uknown Bandolier action %i", bs->action);
} }
} }
@ -3339,7 +3339,7 @@ void Client::Handle_OP_BankerChange(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(BankerChange_Struct) && app->size != 4) //Titanium only sends 4 Bytes for this if (app->size != sizeof(BankerChange_Struct) && app->size != 4) //Titanium only sends 4 Bytes for this
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_BankerChange expected %i got %i", sizeof(BankerChange_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_BankerChange expected %i got %i", sizeof(BankerChange_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -3424,7 +3424,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
if (app->size < 4) if (app->size < 4)
{ {
logger.LogDebug(EQEmuLogSys::General, "OP_Barter packet below minimum expected size. The packet was %i bytes.", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "OP_Barter packet below minimum expected size. The packet was %i bytes.", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -3730,7 +3730,7 @@ void Client::Handle_OP_Bind_Wound(const EQApplicationPacket *app)
logger.Log(EQEmuLogSys::Error, "Bindwound on non-exsistant mob from %s", this->GetName()); logger.Log(EQEmuLogSys::Error, "Bindwound on non-exsistant mob from %s", this->GetName());
} }
else { else {
logger.LogDebug(EQEmuLogSys::General, "BindWound in: to:\'%s\' from=\'%s\'", bindmob->GetName(), GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "BindWound in: to:\'%s\' from=\'%s\'", bindmob->GetName(), GetName());
BindWound(bindmob, true); BindWound(bindmob, true);
} }
return; return;
@ -3743,7 +3743,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app)
if (app->size != sizeof(BlockedBuffs_Struct)) if (app->size != sizeof(BlockedBuffs_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_BlockedBuffs expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_BlockedBuffs expected %i got %i",
sizeof(BlockedBuffs_Struct), app->size); sizeof(BlockedBuffs_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -3941,7 +3941,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(CancelTask_Struct)) { if (app->size != sizeof(CancelTask_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_CancelTask expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_CancelTask expected %i got %i",
sizeof(CancelTask_Struct), app->size); sizeof(CancelTask_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -4006,16 +4006,16 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
targetring_z = castspell->z_pos; targetring_z = castspell->z_pos;
#ifdef _EQDEBUG #ifdef _EQDEBUG
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[0], castspell->cs_unknown[0]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[0], castspell->cs_unknown[0]);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[1], castspell->cs_unknown[1]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[1], castspell->cs_unknown[1]);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[2], castspell->cs_unknown[2]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[2], castspell->cs_unknown[2]);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[3], castspell->cs_unknown[3]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: %u %i", (uint8)castspell->cs_unknown[3], castspell->cs_unknown[3]);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: 32 %p %u", &castspell->cs_unknown, *(uint32*)castspell->cs_unknown); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: 32 %p %u", &castspell->cs_unknown, *(uint32*)castspell->cs_unknown);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: 32 %p %i", &castspell->cs_unknown, *(uint32*)castspell->cs_unknown); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: 32 %p %i", &castspell->cs_unknown, *(uint32*)castspell->cs_unknown);
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: 16 %p %u %u", &castspell->cs_unknown, *(uint16*)castspell->cs_unknown, *(uint16*)castspell->cs_unknown + sizeof(uint16)); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: 16 %p %u %u", &castspell->cs_unknown, *(uint16*)castspell->cs_unknown, *(uint16*)castspell->cs_unknown + sizeof(uint16));
logger.LogDebug(EQEmuLogSys::General, "cs_unknown2: 16 %p %i %i", &castspell->cs_unknown, *(uint16*)castspell->cs_unknown, *(uint16*)castspell->cs_unknown + sizeof(uint16)); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "cs_unknown2: 16 %p %i %i", &castspell->cs_unknown, *(uint16*)castspell->cs_unknown, *(uint16*)castspell->cs_unknown + sizeof(uint16));
#endif #endif
logger.LogDebug(EQEmuLogSys::General, "OP CastSpell: slot=%d, spell=%d, target=%d, inv=%lx", castspell->slot, castspell->spell_id, castspell->target_id, (unsigned long)castspell->inventoryslot); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "OP CastSpell: slot=%d, spell=%d, target=%d, inv=%lx", castspell->slot, castspell->spell_id, castspell->target_id, (unsigned long)castspell->inventoryslot);
std::cout << "OP_CastSpell " << castspell->slot << " spell " << castspell->spell_id << " inventory slot " << castspell->inventoryslot << "\n" << std::endl; std::cout << "OP_CastSpell " << castspell->slot << " spell " << castspell->spell_id << " inventory slot " << castspell->inventoryslot << "\n" << std::endl;
@ -4047,7 +4047,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
//discipline, using the item spell slot //discipline, using the item spell slot
if (castspell->inventoryslot == INVALID_INDEX) { if (castspell->inventoryslot == INVALID_INDEX) {
if (!UseDiscipline(castspell->spell_id, castspell->target_id)) { if (!UseDiscipline(castspell->spell_id, castspell->target_id)) {
logger.LogDebug(EQEmuLogSys::General, "Unknown ability being used by %s, spell being cast is: %i\n", GetName(), castspell->spell_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Unknown ability being used by %s, spell being cast is: %i\n", GetName(), castspell->spell_id);
InterruptSpell(castspell->spell_id); InterruptSpell(castspell->spell_id);
} }
return; return;
@ -4190,7 +4190,7 @@ void Client::Handle_OP_ClearBlockedBuffs(const EQApplicationPacket *app)
if (app->size != 1) if (app->size != 1)
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_ClearBlockedBuffs expected 1 got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_ClearBlockedBuffs expected 1 got %i", app->size);
DumpPacket(app); DumpPacket(app);
@ -4212,7 +4212,7 @@ void Client::Handle_OP_ClearNPCMarks(const EQApplicationPacket *app)
if (app->size != 0) if (app->size != 0)
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_ClearNPCMarks expected 0 got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_ClearNPCMarks expected 0 got %i",
app->size); app->size);
DumpPacket(app); DumpPacket(app);
@ -4718,7 +4718,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Consider_Struct)) if (app->size != sizeof(Consider_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in Consider expected %i got %i", sizeof(Consider_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in Consider expected %i got %i", sizeof(Consider_Struct), app->size);
return; return;
} }
Consider_Struct* conin = (Consider_Struct*)app->pBuffer; Consider_Struct* conin = (Consider_Struct*)app->pBuffer;
@ -4812,7 +4812,7 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Consider_Struct)) if (app->size != sizeof(Consider_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in Consider corpse expected %i got %i", sizeof(Consider_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in Consider corpse expected %i got %i", sizeof(Consider_Struct), app->size);
return; return;
} }
Consider_Struct* conin = (Consider_Struct*)app->pBuffer; Consider_Struct* conin = (Consider_Struct*)app->pBuffer;
@ -5136,7 +5136,7 @@ void Client::Handle_OP_DelegateAbility(const EQApplicationPacket *app)
if (app->size != sizeof(DelegateAbility_Struct)) if (app->size != sizeof(DelegateAbility_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_DelegateAbility expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_DelegateAbility expected %i got %i",
sizeof(DelegateAbility_Struct), app->size); sizeof(DelegateAbility_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -5311,7 +5311,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app)
if (app->size != sizeof(DoGroupLeadershipAbility_Struct)) { if (app->size != sizeof(DoGroupLeadershipAbility_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_DoGroupLeadershipAbility expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_DoGroupLeadershipAbility expected %i got %i",
sizeof(DoGroupLeadershipAbility_Struct), app->size); sizeof(DoGroupLeadershipAbility_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -5363,7 +5363,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app)
} }
default: default:
logger.LogDebug(EQEmuLogSys::General, "Got unhandled OP_DoGroupLeadershipAbility Ability: %d Parameter: %d", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Got unhandled OP_DoGroupLeadershipAbility Ability: %d Parameter: %d",
dglas->Ability, dglas->Parameter); dglas->Ability, dglas->Parameter);
break; break;
} }
@ -5927,7 +5927,7 @@ void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
void Client::Handle_OP_GMEndTraining(const EQApplicationPacket *app) void Client::Handle_OP_GMEndTraining(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GMTrainEnd_Struct)) { if (app->size != sizeof(GMTrainEnd_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_GMEndTraining expected %i got %i", sizeof(GMTrainEnd_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_GMEndTraining expected %i got %i", sizeof(GMTrainEnd_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -6177,7 +6177,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
if (app->size < sizeof(GMSearchCorpse_Struct)) if (app->size < sizeof(GMSearchCorpse_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "OP_GMSearchCorpse size lower than expected: got %u expected at least %u", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "OP_GMSearchCorpse size lower than expected: got %u expected at least %u",
app->size, sizeof(GMSearchCorpse_Struct)); app->size, sizeof(GMSearchCorpse_Struct));
DumpPacket(app); DumpPacket(app);
return; return;
@ -6300,7 +6300,7 @@ void Client::Handle_OP_GMToggle(const EQApplicationPacket *app)
void Client::Handle_OP_GMTraining(const EQApplicationPacket *app) void Client::Handle_OP_GMTraining(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GMTrainee_Struct)) { if (app->size != sizeof(GMTrainee_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_GMTraining expected %i got %i", sizeof(GMTrainee_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_GMTraining expected %i got %i", sizeof(GMTrainee_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -6311,7 +6311,7 @@ void Client::Handle_OP_GMTraining(const EQApplicationPacket *app)
void Client::Handle_OP_GMTrainSkill(const EQApplicationPacket *app) void Client::Handle_OP_GMTrainSkill(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GMSkillChange_Struct)) { if (app->size != sizeof(GMSkillChange_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_GMTrainSkill expected %i got %i", sizeof(GMSkillChange_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_GMTrainSkill expected %i got %i", sizeof(GMSkillChange_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -6445,7 +6445,7 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
return; return;
} }
logger.LogDebug(EQEmuLogSys::General, "Member Disband Request from %s\n", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Member Disband Request from %s\n", GetName());
GroupGeneric_Struct* gd = (GroupGeneric_Struct*)app->pBuffer; GroupGeneric_Struct* gd = (GroupGeneric_Struct*)app->pBuffer;
@ -6725,7 +6725,7 @@ void Client::Handle_OP_GroupMakeLeader(const EQApplicationPacket *app)
if (g->IsLeader(this)) if (g->IsLeader(this))
g->ChangeLeader(NewLeader); g->ChangeLeader(NewLeader);
else { else {
logger.LogDebug(EQEmuLogSys::General, "Group /makeleader request originated from non-leader member: %s", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Group /makeleader request originated from non-leader member: %s", GetName());
DumpPacket(app); DumpPacket(app);
} }
} }
@ -6816,7 +6816,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GroupUpdate_Struct)) if (app->size != sizeof(GroupUpdate_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch on OP_GroupUpdate: got %u expected %u", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch on OP_GroupUpdate: got %u expected %u",
app->size, sizeof(GroupUpdate_Struct)); app->size, sizeof(GroupUpdate_Struct));
DumpPacket(app); DumpPacket(app);
return; return;
@ -6835,7 +6835,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
if (group->IsLeader(this)) if (group->IsLeader(this))
group->ChangeLeader(newleader); group->ChangeLeader(newleader);
else { else {
logger.LogDebug(EQEmuLogSys::General, "Group /makeleader request originated from non-leader member: %s", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Group /makeleader request originated from non-leader member: %s", GetName());
DumpPacket(app); DumpPacket(app);
} }
} }
@ -6844,7 +6844,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
default: default:
{ {
logger.LogDebug(EQEmuLogSys::General, "Received unhandled OP_GroupUpdate requesting action %u", gu->action); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Received unhandled OP_GroupUpdate requesting action %u", gu->action);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -7782,7 +7782,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GuildStatus_Struct)) if (app->size != sizeof(GuildStatus_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_GuildStatus expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_GuildStatus expected %i got %i",
sizeof(GuildStatus_Struct), app->size); sizeof(GuildStatus_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -7839,7 +7839,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(GuildUpdateURLAndChannel_Struct)) if (app->size != sizeof(GuildUpdateURLAndChannel_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_GuildUpdateURLAndChannel expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_GuildUpdateURLAndChannel expected %i got %i",
sizeof(GuildUpdateURLAndChannel_Struct), app->size); sizeof(GuildUpdateURLAndChannel_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -7943,7 +7943,7 @@ void Client::Handle_OP_HideCorpse(const EQApplicationPacket *app)
// //
if (app->size != sizeof(HideCorpse_Struct)) if (app->size != sizeof(HideCorpse_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_HideCorpse expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_HideCorpse expected %i got %i",
sizeof(HideCorpse_Struct), app->size); sizeof(HideCorpse_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -8449,7 +8449,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
} }
if (slot_id < 0) { if (slot_id < 0) {
logger.LogDebug(EQEmuLogSys::General, "Unknown slot being used by %s, slot being used is: %i", GetName(), request->slot); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Unknown slot being used by %s, slot being used is: %i", GetName(), request->slot);
return; return;
} }
@ -8492,7 +8492,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
return; return;
} }
logger.LogDebug(EQEmuLogSys::General, "OP ItemVerifyRequest: spell=%i, target=%i, inv=%i", spell_id, target_id, slot_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "OP ItemVerifyRequest: spell=%i, target=%i, inv=%i", spell_id, target_id, slot_id);
if (m_inv.SupportsClickCasting(slot_id) || ((item->ItemType == ItemTypePotion || item->PotionBelt) && m_inv.SupportsPotionBeltCasting(slot_id))) // sanity check if (m_inv.SupportsClickCasting(slot_id) || ((item->ItemType == ItemTypePotion || item->PotionBelt) && m_inv.SupportsPotionBeltCasting(slot_id))) // sanity check
{ {
@ -8530,7 +8530,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
if ((spell_id <= 0) && (item->ItemType != ItemTypeFood && item->ItemType != ItemTypeDrink && item->ItemType != ItemTypeAlcohol && item->ItemType != ItemTypeSpell)) if ((spell_id <= 0) && (item->ItemType != ItemTypeFood && item->ItemType != ItemTypeDrink && item->ItemType != ItemTypeAlcohol && item->ItemType != ItemTypeSpell))
{ {
logger.LogDebug(EQEmuLogSys::General, "Item with no effect right clicked by %s", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Item with no effect right clicked by %s", GetName());
} }
else if (inst->IsType(ItemClassCommon)) else if (inst->IsType(ItemClassCommon))
{ {
@ -8603,7 +8603,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
{ {
if (item->ItemType != ItemTypeFood && item->ItemType != ItemTypeDrink && item->ItemType != ItemTypeAlcohol) if (item->ItemType != ItemTypeFood && item->ItemType != ItemTypeDrink && item->ItemType != ItemTypeAlcohol)
{ {
logger.LogDebug(EQEmuLogSys::General, "Error: unknown item->Click.Type (%i)", item->Click.Type); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Error: unknown item->Click.Type (%i)", item->Click.Type);
} }
else else
{ {
@ -8619,7 +8619,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
else if (item->ItemType == ItemTypeAlcohol) else if (item->ItemType == ItemTypeAlcohol)
{ {
#if EQDEBUG >= 1 #if EQDEBUG >= 1
logger.LogDebug(EQEmuLogSys::General, "Drinking Alcohol from slot:%i", slot_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Drinking Alcohol from slot:%i", slot_id);
#endif #endif
// This Seems to be handled in OP_DeleteItem handling // This Seems to be handled in OP_DeleteItem handling
//DeleteItemInInventory(slot_id, 1, false); //DeleteItemInInventory(slot_id, 1, false);
@ -8646,7 +8646,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
} }
else else
{ {
logger.LogDebug(EQEmuLogSys::General, "Error: unknown item->Click.Type (%i)", item->Click.Type); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Error: unknown item->Click.Type (%i)", item->Click.Type);
} }
} }
} }
@ -8787,7 +8787,7 @@ void Client::Handle_OP_LDoNSenseTraps(const EQApplicationPacket *app)
void Client::Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app) void Client::Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app)
{ {
if (app->size != 1) { if (app->size != 1) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -9327,7 +9327,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
if (app->size != sizeof(MercenaryCommand_Struct)) if (app->size != sizeof(MercenaryCommand_Struct))
{ {
Message(13, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size); Message(13, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -9384,7 +9384,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
// The payload is 4 bytes. The EntityID of the Mercenary Liason which are of class 71. // The payload is 4 bytes. The EntityID of the Mercenary Liason which are of class 71.
if (app->size != sizeof(MercenaryMerchantShopRequest_Struct)) if (app->size != sizeof(MercenaryMerchantShopRequest_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryDataRequest expected 4 got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryDataRequest expected 4 got %i", app->size);
DumpPacket(app); DumpPacket(app);
@ -9519,7 +9519,7 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
if (app->size != 0) if (app->size != 0)
{ {
Message(13, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size); Message(13, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -9539,7 +9539,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
if (app->size > 1) if (app->size > 1)
{ {
Message(13, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size); Message(13, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -9564,7 +9564,7 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
// The payload is 16 bytes. First four bytes are the Merc ID (Template ID) // The payload is 16 bytes. First four bytes are the Merc ID (Template ID)
if (app->size != sizeof(MercenaryMerchantRequest_Struct)) if (app->size != sizeof(MercenaryMerchantRequest_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryHire expected %i got %i", sizeof(MercenaryMerchantRequest_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryHire expected %i got %i", sizeof(MercenaryMerchantRequest_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -9636,7 +9636,7 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
if (app->size != sizeof(SuspendMercenary_Struct)) if (app->size != sizeof(SuspendMercenary_Struct))
{ {
Message(13, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size); Message(13, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -9660,7 +9660,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
if (app->size > 1) if (app->size > 1)
{ {
Message(13, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size); Message(13, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -10516,7 +10516,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(PopupResponse_Struct)) { if (app->size != sizeof(PopupResponse_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_PopupResponse expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_PopupResponse expected %i got %i",
sizeof(PopupResponse_Struct), app->size); sizeof(PopupResponse_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -10551,7 +10551,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app) void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(MovePotionToBelt_Struct)) { if (app->size != sizeof(MovePotionToBelt_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_PotionBelt expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_PotionBelt expected %i got %i",
sizeof(MovePotionToBelt_Struct), app->size); sizeof(MovePotionToBelt_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -10559,7 +10559,7 @@ void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app)
MovePotionToBelt_Struct *mptbs = (MovePotionToBelt_Struct*)app->pBuffer; MovePotionToBelt_Struct *mptbs = (MovePotionToBelt_Struct*)app->pBuffer;
if(!EQEmu::ValueWithin(mptbs->SlotNumber, 0U, 3U)) { if(!EQEmu::ValueWithin(mptbs->SlotNumber, 0U, 3U)) {
logger.LogDebug(EQEmuLogSys::General, "Client::Handle_OP_PotionBelt mptbs->SlotNumber out of range."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client::Handle_OP_PotionBelt mptbs->SlotNumber out of range.");
return; return;
} }
@ -10582,7 +10582,7 @@ void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app)
void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app) void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(uint32)) { if (app->size != sizeof(uint32)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -10672,7 +10672,7 @@ void Client::Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *a
// //
if (app->size != sizeof(PVPLeaderBoardDetailsRequest_Struct)) if (app->size != sizeof(PVPLeaderBoardDetailsRequest_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_PVPLeaderBoardDetailsRequest expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_PVPLeaderBoardDetailsRequest expected %i got %i",
sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size); sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -10699,7 +10699,7 @@ void Client::Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app)
// //
if (app->size != sizeof(PVPLeaderBoardRequest_Struct)) if (app->size != sizeof(PVPLeaderBoardRequest_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_PVPLeaderBoardRequest expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_PVPLeaderBoardRequest expected %i got %i",
sizeof(PVPLeaderBoardRequest_Struct), app->size); sizeof(PVPLeaderBoardRequest_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -11385,7 +11385,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
TradeskillFavorites_Struct* tsf = (TradeskillFavorites_Struct*)app->pBuffer; TradeskillFavorites_Struct* tsf = (TradeskillFavorites_Struct*)app->pBuffer;
logger.LogDebug(EQEmuLogSys::General, "Requested Favorites for: %d - %d\n", tsf->object_type, tsf->some_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Requested Favorites for: %d - %d\n", tsf->object_type, tsf->some_id);
// results show that object_type is combiner type // results show that object_type is combiner type
// some_id = 0 if world combiner, item number otherwise // some_id = 0 if world combiner, item number otherwise
@ -11446,7 +11446,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
rss->query[55] = '\0'; //just to be sure. rss->query[55] = '\0'; //just to be sure.
logger.LogDebug(EQEmuLogSys::General, "Requested search recipes for: %d - %d\n", rss->object_type, rss->some_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Requested search recipes for: %d - %d\n", rss->object_type, rss->some_id);
// make where clause segment for container(s) // make where clause segment for container(s)
char containers[30]; char containers[30];
@ -11506,7 +11506,7 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app)
if (app->size != sizeof(BlockedBuffs_Struct)) if (app->size != sizeof(BlockedBuffs_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_RemoveBlockedBuffs expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_RemoveBlockedBuffs expected %i got %i",
sizeof(BlockedBuffs_Struct), app->size); sizeof(BlockedBuffs_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -11669,7 +11669,7 @@ void Client::Handle_OP_RespawnWindow(const EQApplicationPacket *app)
// //
if (app->size != 4) if (app->size != 4)
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_RespawnWindow expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_RespawnWindow expected %i got %i",
4, app->size); 4, app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -11720,7 +11720,7 @@ void Client::Handle_OP_Sacrifice(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Sacrifice_Struct)) { if (app->size != sizeof(Sacrifice_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_Sacrifice expected %i got %i", sizeof(Sacrifice_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_Sacrifice expected %i got %i", sizeof(Sacrifice_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -11969,7 +11969,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
void Client::Handle_OP_SetTitle(const EQApplicationPacket *app) void Client::Handle_OP_SetTitle(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(SetTitle_Struct)) { if (app->size != sizeof(SetTitle_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_SetTitle expected %i got %i", sizeof(SetTitle_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_SetTitle expected %i got %i", sizeof(SetTitle_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -12098,7 +12098,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
t1.start(); t1.start();
Merchant_Sell_Struct* mp = (Merchant_Sell_Struct*)app->pBuffer; Merchant_Sell_Struct* mp = (Merchant_Sell_Struct*)app->pBuffer;
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "%s, purchase item..", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "%s, purchase item..", GetName());
DumpPacket(app); DumpPacket(app);
#endif #endif
@ -12834,7 +12834,7 @@ void Client::Handle_OP_Surname(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Surname_Struct)) if (app->size != sizeof(Surname_Struct))
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in Surname expected %i got %i", sizeof(Surname_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in Surname expected %i got %i", sizeof(Surname_Struct), app->size);
return; return;
} }
@ -13149,7 +13149,7 @@ void Client::Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(TaskHistoryRequest_Struct)) { if (app->size != sizeof(TaskHistoryRequest_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_TaskHistoryRequest expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_TaskHistoryRequest expected %i got %i",
sizeof(TaskHistoryRequest_Struct), app->size); sizeof(TaskHistoryRequest_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
@ -13691,7 +13691,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
{ {
if (app->size != sizeof(Translocate_Struct)) { if (app->size != sizeof(Translocate_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_Translocate expected %i got %i", sizeof(Translocate_Struct), app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_Translocate expected %i got %i", sizeof(Translocate_Struct), app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -13836,7 +13836,7 @@ void Client::Handle_OP_VetClaimRequest(const EQApplicationPacket *app)
{ {
if (app->size < sizeof(VeteranClaimRequest)) if (app->size < sizeof(VeteranClaimRequest))
{ {
logger.LogDebug(EQEmuLogSys::General, "OP_VetClaimRequest size lower than expected: got %u expected at least %u", app->size, sizeof(VeteranClaimRequest)); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "OP_VetClaimRequest size lower than expected: got %u expected at least %u", app->size, sizeof(VeteranClaimRequest));
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -13876,7 +13876,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app)
if (app->size != sizeof(VoiceMacroIn_Struct)) { if (app->size != sizeof(VoiceMacroIn_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_VoiceMacroIn expected %i got %i", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_VoiceMacroIn expected %i got %i",
sizeof(VoiceMacroIn_Struct), app->size); sizeof(VoiceMacroIn_Struct), app->size);
DumpPacket(app); DumpPacket(app);
@ -13927,7 +13927,7 @@ void Client::Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket *app)
{ {
if (app->size != 1) if (app->size != 1)
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_XTargetAutoAddHaters, expected 1, got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_XTargetAutoAddHaters, expected 1, got %i", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -13939,7 +13939,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app)
{ {
if (app->size < 12) if (app->size < 12)
{ {
logger.LogDebug(EQEmuLogSys::General, "Size mismatch in OP_XTargetRequest, expected at least 12, got %i", app->size); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Size mismatch in OP_XTargetRequest, expected at least 12, got %i", app->size);
DumpPacket(app); DumpPacket(app);
return; return;
} }
@ -14162,7 +14162,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app)
} }
default: default:
logger.LogDebug(EQEmuLogSys::General, "Unhandled XTarget Type %i", Type); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Unhandled XTarget Type %i", Type);
break; break;
} }

2
zone/client_process.cpp
View File

@ -1037,7 +1037,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
// Account for merchant lists with gaps. // Account for merchant lists with gaps.
if (ml.slot >= i) { if (ml.slot >= i) {
if (ml.slot > i) if (ml.slot > i)
logger.LogDebug(EQEmuLogSys::General, "(WARNING) Merchantlist contains gap at slot %d. Merchant: %d, NPC: %d", i, merchant_id, npcid); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "(WARNING) Merchantlist contains gap at slot %d. Merchant: %d, NPC: %d", i, merchant_id, npcid);
i = ml.slot + 1; i = ml.slot + 1;
} }
} }

2
zone/command.cpp
View File

@ -10394,7 +10394,7 @@ void command_logtest(Client *c, const Seperator *sep){
if (sep->IsNumber(1)){ if (sep->IsNumber(1)){
uint32 i = 0; uint32 i = 0;
for (i = 0; i < atoi(sep->arg[1]); i++){ for (i = 0; i < atoi(sep->arg[1]); i++){
logger.LogDebug(EQEmuLogSys::General, "[%u] Test... Took %f seconds", i, ((float)(std::clock() - t)) / CLOCKS_PER_SEC); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "[%u] Test... Took %f seconds", i, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
} }
} }
} }

6
zone/corpse.cpp
View File

@ -842,7 +842,7 @@ bool Corpse::Process() {
spc->zone_id = zone->graveyard_zoneid(); spc->zone_id = zone->graveyard_zoneid();
worldserver.SendPacket(pack); worldserver.SendPacket(pack);
safe_delete(pack); safe_delete(pack);
logger.LogDebug(EQEmuLogSys::General, "Moved %s player corpse to the designated graveyard in zone %s.", this->GetName(), database.GetZoneName(zone->graveyard_zoneid())); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Moved %s player corpse to the designated graveyard in zone %s.", this->GetName(), database.GetZoneName(zone->graveyard_zoneid()));
corpse_db_id = 0; corpse_db_id = 0;
} }
@ -872,7 +872,7 @@ bool Corpse::Process() {
Save(); Save();
player_corpse_depop = true; player_corpse_depop = true;
corpse_db_id = 0; corpse_db_id = 0;
logger.LogDebug(EQEmuLogSys::General, "Tagged %s player corpse has burried.", this->GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Tagged %s player corpse has burried.", this->GetName());
} }
else { else {
logger.Log(EQEmuLogSys::Error, "Unable to bury %s player corpse.", this->GetName()); logger.Log(EQEmuLogSys::Error, "Unable to bury %s player corpse.", this->GetName());
@ -1083,7 +1083,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
for(; cur != end; ++cur) { for(; cur != end; ++cur) {
ServerLootItem_Struct* item_data = *cur; ServerLootItem_Struct* item_data = *cur;
item = database.GetItem(item_data->item_id); item = database.GetItem(item_data->item_id);
logger.LogDebug(EQEmuLogSys::General, "Corpse Looting: %s was not sent to client loot window (corpse_dbid: %i, charname: %s(%s))", item->Name, GetCorpseDBID(), client->GetName(), client->GetGM() ? "GM" : "Owner"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Corpse Looting: %s was not sent to client loot window (corpse_dbid: %i, charname: %s(%s))", item->Name, GetCorpseDBID(), client->GetName(), client->GetGM() ? "GM" : "Owner");
client->Message(0, "Inaccessable Corpse Item: %s", item->Name); client->Message(0, "Inaccessable Corpse Item: %s", item->Name);
} }
} }

2
zone/doors.cpp
View File

@ -303,7 +303,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger)
sender->CheckIncreaseSkill(SkillPickLock, nullptr, 1); sender->CheckIncreaseSkill(SkillPickLock, nullptr, 1);
#if EQDEBUG>=5 #if EQDEBUG>=5
logger.LogDebug(EQEmuLogSys::General, "Client has lockpicks: skill=%f", modskill); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Client has lockpicks: skill=%f", modskill);
#endif #endif
if(GetLockpick() <= modskill) if(GetLockpick() <= modskill)

8
zone/groups.cpp
View File

@ -1098,7 +1098,7 @@ void Group::VerifyGroup() {
for (i = 0; i < MAX_GROUP_MEMBERS; i++) { for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
if (membername[i][0] == '\0') { if (membername[i][0] == '\0') {
#if EQDEBUG >= 7 #if EQDEBUG >= 7
logger.LogDebug(EQEmuLogSys::General, "Group %lu: Verify %d: Empty.\n", (unsigned long)GetID(), i); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Group %lu: Verify %d: Empty.\n", (unsigned long)GetID(), i);
#endif #endif
members[i] = nullptr; members[i] = nullptr;
continue; continue;
@ -1107,7 +1107,7 @@ void Group::VerifyGroup() {
Mob *them = entity_list.GetMob(membername[i]); Mob *them = entity_list.GetMob(membername[i]);
if(them == nullptr && members[i] != nullptr) { //they aren't in zone if(them == nullptr && members[i] != nullptr) { //they aren't in zone
#if EQDEBUG >= 6 #if EQDEBUG >= 6
logger.LogDebug(EQEmuLogSys::General, "Member of group %lu named '%s' has disappeared!!", (unsigned long)GetID(), membername[i]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Member of group %lu named '%s' has disappeared!!", (unsigned long)GetID(), membername[i]);
#endif #endif
membername[i][0] = '\0'; membername[i][0] = '\0';
members[i] = nullptr; members[i] = nullptr;
@ -1116,13 +1116,13 @@ void Group::VerifyGroup() {
if(them != nullptr && members[i] != them) { //our pointer is out of date... not so good. if(them != nullptr && members[i] != them) { //our pointer is out of date... not so good.
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "Member of group %lu named '%s' had an out of date pointer!!", (unsigned long)GetID(), membername[i]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Member of group %lu named '%s' had an out of date pointer!!", (unsigned long)GetID(), membername[i]);
#endif #endif
members[i] = them; members[i] = them;
continue; continue;
} }
#if EQDEBUG >= 8 #if EQDEBUG >= 8
logger.LogDebug(EQEmuLogSys::General, "Member of group %lu named '%s' is valid.", (unsigned long)GetID(), membername[i]); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Member of group %lu named '%s' is valid.", (unsigned long)GetID(), membername[i]);
#endif #endif
} }
} }

2
zone/inventory.cpp
View File

@ -700,7 +700,7 @@ void Client::SendCursorBuffer() {
// Remove item from inventory // Remove item from inventory
void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_update, bool update_db) { void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_update, bool update_db) {
#if (EQDEBUG >= 5) #if (EQDEBUG >= 5)
logger.LogDebug(EQEmuLogSys::General, "DeleteItemInInventory(%i, %i, %s)", slot_id, quantity, (client_update) ? "true":"false"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "DeleteItemInInventory(%i, %i, %s)", slot_id, quantity, (client_update) ? "true":"false");
#endif #endif
// Added 'IsSlotValid(slot_id)' check to both segments of client packet processing. // Added 'IsSlotValid(slot_id)' check to both segments of client packet processing.

4
zone/loottables.cpp
View File

@ -145,7 +145,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml
drop_chance = zone->random.Real(0.0, 100.0); drop_chance = zone->random.Real(0.0, 100.0);
#if EQDEBUG>=11 #if EQDEBUG>=11
logger.LogDebug(EQEmuLogSys::General, "Drop chance for npc: %s, this chance:%f, drop roll:%f", npc->GetName(), thischance, drop_chance); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Drop chance for npc: %s, this chance:%f, drop roll:%f", npc->GetName(), thischance, drop_chance);
#endif #endif
if (thischance == 100.0 || drop_chance < thischance) if (thischance == 100.0 || drop_chance < thischance)
{ {
@ -187,7 +187,7 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge
ServerLootItem_Struct* item = new ServerLootItem_Struct; ServerLootItem_Struct* item = new ServerLootItem_Struct;
#if EQDEBUG>=11 #if EQDEBUG>=11
logger.LogDebug(EQEmuLogSys::General, "Adding drop to npc: %s, Item: %i", GetName(), item2->ID); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Adding drop to npc: %s, Item: %i", GetName(), item2->ID);
#endif #endif
EQApplicationPacket* outapp = nullptr; EQApplicationPacket* outapp = nullptr;

4
zone/merc.cpp
View File

@ -885,7 +885,7 @@ int32 Merc::CalcMaxMana()
break; break;
} }
default: { default: {
logger.LogDebug(EQEmuLogSys::General, "Invalid Class '%c' in CalcMaxMana", GetCasterClass()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
max_mana = 0; max_mana = 0;
break; break;
} }
@ -906,7 +906,7 @@ int32 Merc::CalcMaxMana()
} }
#if EQDEBUG >= 11 #if EQDEBUG >= 11
logger.LogDebug(EQEmuLogSys::General, "Merc::CalcMaxMana() called for %s - returning %d", GetName(), max_mana); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Merc::CalcMaxMana() called for %s - returning %d", GetName(), max_mana);
#endif #endif
return max_mana; return max_mana;
} }

2
zone/petitions.cpp
View File

@ -259,7 +259,7 @@ void ZoneDatabase::InsertPetitionToDB(Petition* wpet)
} }
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "New petition created"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "New petition created");
#endif #endif
} }

2
zone/spawngroup.cpp
View File

@ -51,7 +51,7 @@ SpawnGroup::SpawnGroup( uint32 in_id, char* name, int in_group_spawn_limit, floa
uint32 SpawnGroup::GetNPCType() { uint32 SpawnGroup::GetNPCType() {
#if EQDEBUG >= 10 #if EQDEBUG >= 10
logger.LogDebug(EQEmuLogSys::General, "SpawnGroup[%08x]::GetNPCType()", (uint32) this); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "SpawnGroup[%08x]::GetNPCType()", (uint32) this);
#endif #endif
int npcType = 0; int npcType = 0;
int totalchance = 0; int totalchance = 0;

6
zone/spell_effects.cpp
View File

@ -476,7 +476,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(!target_zone) { if(!target_zone) {
#ifdef SPELL_EFFECT_SPAM #ifdef SPELL_EFFECT_SPAM
logger.LogDebug(EQEmuLogSys::General, "Succor/Evacuation Spell In Same Zone."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Succor/Evacuation Spell In Same Zone.");
#endif #endif
if(IsClient()) if(IsClient())
CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), x, y, z, heading, 0, EvacToSafeCoords); CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), x, y, z, heading, 0, EvacToSafeCoords);
@ -485,7 +485,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
} }
else { else {
#ifdef SPELL_EFFECT_SPAM #ifdef SPELL_EFFECT_SPAM
logger.LogDebug(EQEmuLogSys::General, "Succor/Evacuation Spell To Another Zone."); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Succor/Evacuation Spell To Another Zone.");
#endif #endif
if(IsClient()) if(IsClient())
CastToClient()->MovePC(target_zone, x, y, z, heading); CastToClient()->MovePC(target_zone, x, y, z, heading);
@ -3326,7 +3326,7 @@ snare has both of them negative, yet their range should work the same:
result = ubase * (caster_level * (formula - 2000) + 1); result = ubase * (caster_level * (formula - 2000) + 1);
} }
else else
logger.LogDebug(EQEmuLogSys::General, "Unknown spell effect value forumula %d", formula); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Unknown spell effect value forumula %d", formula);
} }
} }

2
zone/spells.cpp
View File

@ -2673,7 +2673,7 @@ int CalcBuffDuration_formula(int level, int formula, int duration)
return duration ? duration : 3600; return duration ? duration : 3600;
default: default:
logger.LogDebug(EQEmuLogSys::General, "CalcBuffDuration_formula: unknown formula %d", formula); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "CalcBuffDuration_formula: unknown formula %d", formula);
return 0; return 0;
} }
} }

10
zone/trading.cpp
View File

@ -86,7 +86,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
if (!owner || !owner->IsClient()) { if (!owner || !owner->IsClient()) {
// This should never happen // This should never happen
logger.LogDebug(EQEmuLogSys::General, "Programming error: NPC's should not call Trade::AddEntity()"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Programming error: NPC's should not call Trade::AddEntity()");
return; return;
} }
@ -296,7 +296,7 @@ void Trade::LogTrade()
void Trade::DumpTrade() void Trade::DumpTrade()
{ {
Mob* with = With(); Mob* with = With();
logger.LogDebug(EQEmuLogSys::General, "Dumping trade data: '%s' in TradeState %i with '%s'", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Dumping trade data: '%s' in TradeState %i with '%s'",
this->owner->GetName(), state, ((with==nullptr)?"(null)":with->GetName())); this->owner->GetName(), state, ((with==nullptr)?"(null)":with->GetName()));
if (!owner->IsClient()) if (!owner->IsClient())
@ -307,7 +307,7 @@ void Trade::DumpTrade()
const ItemInst* inst = trader->GetInv().GetItem(i); const ItemInst* inst = trader->GetInv().GetItem(i);
if (inst) { if (inst) {
logger.LogDebug(EQEmuLogSys::General, "Item %i (Charges=%i, Slot=%i, IsBag=%s)", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Item %i (Charges=%i, Slot=%i, IsBag=%s)",
inst->GetItem()->ID, inst->GetCharges(), inst->GetItem()->ID, inst->GetCharges(),
i, ((inst->IsType(ItemClassContainer)) ? "True" : "False")); i, ((inst->IsType(ItemClassContainer)) ? "True" : "False"));
@ -315,7 +315,7 @@ void Trade::DumpTrade()
for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) {
inst = trader->GetInv().GetItem(i, j); inst = trader->GetInv().GetItem(i, j);
if (inst) { if (inst) {
logger.LogDebug(EQEmuLogSys::General, "\tBagItem %i (Charges=%i, Slot=%i)", logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "\tBagItem %i (Charges=%i, Slot=%i)",
inst->GetItem()->ID, inst->GetCharges(), inst->GetItem()->ID, inst->GetCharges(),
Inventory::CalcSlotId(i, j)); Inventory::CalcSlotId(i, j));
} }
@ -324,7 +324,7 @@ void Trade::DumpTrade()
} }
} }
logger.LogDebug(EQEmuLogSys::General, "\tpp:%i, gp:%i, sp:%i, cp:%i", pp, gp, sp, cp); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "\tpp:%i, gp:%i, sp:%i, cp:%i", pp, gp, sp, cp);
} }
#endif #endif

16
zone/zone.cpp
View File

@ -497,7 +497,7 @@ void Zone::GetMerchantDataForZoneLoad() {
std::map<uint32, std::list<MerchantList> >::iterator cur; std::map<uint32, std::list<MerchantList> >::iterator cur;
uint32 npcid = 0; uint32 npcid = 0;
if (results.RowCount() == 0) { if (results.RowCount() == 0) {
logger.LogDebug(EQEmuLogSys::General, "No Merchant Data found for %s.", GetShortName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "No Merchant Data found for %s.", GetShortName());
return; return;
} }
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
@ -660,7 +660,7 @@ void Zone::LoadMercSpells(){
} }
if(MERC_DEBUG > 0) if(MERC_DEBUG > 0)
logger.LogDebug(EQEmuLogSys::General, "Mercenary Debug: Loaded %i merc spells.", merc_spells_list[1].size() + merc_spells_list[2].size() + merc_spells_list[9].size() + merc_spells_list[12].size()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Mercenary Debug: Loaded %i merc spells.", merc_spells_list[1].size() + merc_spells_list[2].size() + merc_spells_list[9].size() + merc_spells_list[12].size());
} }
@ -801,10 +801,10 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
database.GetZoneLongName(short_name, &long_name, file_name, &psafe_x, &psafe_y, &psafe_z, &pgraveyard_id, &pMaxClients); database.GetZoneLongName(short_name, &long_name, file_name, &psafe_x, &psafe_y, &psafe_z, &pgraveyard_id, &pMaxClients);
if(graveyard_id() > 0) if(graveyard_id() > 0)
{ {
logger.LogDebug(EQEmuLogSys::General, "Graveyard ID is %i.", graveyard_id()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Graveyard ID is %i.", graveyard_id());
bool GraveYardLoaded = database.GetZoneGraveyard(graveyard_id(), &pgraveyard_zoneid, &pgraveyard_x, &pgraveyard_y, &pgraveyard_z, &pgraveyard_heading); bool GraveYardLoaded = database.GetZoneGraveyard(graveyard_id(), &pgraveyard_zoneid, &pgraveyard_x, &pgraveyard_y, &pgraveyard_z, &pgraveyard_heading);
if(GraveYardLoaded) if(GraveYardLoaded)
logger.LogDebug(EQEmuLogSys::General, "Loaded a graveyard for zone %s: graveyard zoneid is %u x is %f y is %f z is %f heading is %f.", short_name, graveyard_zoneid(), graveyard_x(), graveyard_y(), graveyard_z(), graveyard_heading()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Loaded a graveyard for zone %s: graveyard zoneid is %u x is %f y is %f z is %f heading is %f.", short_name, graveyard_zoneid(), graveyard_x(), graveyard_y(), graveyard_z(), graveyard_heading());
else else
logger.Log(EQEmuLogSys::Error, "Unable to load the graveyard id %i for zone %s.", graveyard_id(), short_name); logger.Log(EQEmuLogSys::Error, "Unable to load the graveyard id %i for zone %s.", graveyard_id(), short_name);
} }
@ -814,7 +814,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
autoshutdown_timer.Start(AUTHENTICATION_TIMEOUT * 1000, false); autoshutdown_timer.Start(AUTHENTICATION_TIMEOUT * 1000, false);
Weather_Timer = new Timer(60000); Weather_Timer = new Timer(60000);
Weather_Timer->Start(); Weather_Timer->Start();
logger.LogDebug(EQEmuLogSys::General, "The next weather check for zone: %s will be in %i seconds.", short_name, Weather_Timer->GetRemainingTime()/1000); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "The next weather check for zone: %s will be in %i seconds.", short_name, Weather_Timer->GetRemainingTime()/1000);
zone_weather = 0; zone_weather = 0;
weather_intensity = 0; weather_intensity = 0;
blocked_spells = nullptr; blocked_spells = nullptr;
@ -1403,11 +1403,11 @@ void Zone::ChangeWeather()
weathertimer = weatherTimerRule*1000; weathertimer = weatherTimerRule*1000;
Weather_Timer->Start(weathertimer); Weather_Timer->Start(weathertimer);
} }
logger.LogDebug(EQEmuLogSys::General, "The next weather check for zone: %s will be in %i seconds.", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "The next weather check for zone: %s will be in %i seconds.", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000);
} }
else else
{ {
logger.LogDebug(EQEmuLogSys::General, "The weather for zone: %s has changed. Old weather was = %i. New weather is = %i The next check will be in %i seconds. Rain chance: %i, Rain duration: %i, Snow chance %i, Snow duration: %i", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "The weather for zone: %s has changed. Old weather was = %i. New weather is = %i The next check will be in %i seconds. Rain chance: %i, Rain duration: %i, Snow chance %i, Snow duration: %i", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration);
this->weatherSend(); this->weatherSend();
} }
} }
@ -1492,7 +1492,7 @@ void Zone::Repop(uint32 delay) {
quest_manager.ClearAllTimers(); quest_manager.ClearAllTimers();
if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay)) if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay))
logger.LogDebug(EQEmuLogSys::General, "Error in Zone::Repop: database.PopulateZoneSpawnList failed"); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Error in Zone::Repop: database.PopulateZoneSpawnList failed");
initgrids_timer.Start(); initgrids_timer.Start();

22
zone/zonedb.cpp
View File

@ -1219,7 +1219,7 @@ bool ZoneDatabase::LoadCharacterBindPoint(uint32 character_id, PlayerProfile_Str
bool ZoneDatabase::SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value){ bool ZoneDatabase::SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value){
std::string query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, lang_id, value); QueryDatabase(query); std::string query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, lang_id, value); QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterLanguage for character ID: %i, lang_id:%u value:%u done", character_id, lang_id, value); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterLanguage for character ID: %i, lang_id:%u value:%u done", character_id, lang_id, value);
return true; return true;
} }
@ -1231,10 +1231,10 @@ bool ZoneDatabase::SaveCharacterBindPoint(uint32 character_id, uint32 zone_id, u
/* Save Home Bind Point */ /* Save Home Bind Point */
std::string query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)" std::string query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
" VALUES (%u, %u, %u, %f, %f, %f, %f, %i)", character_id, zone_id, instance_id, x, y, z, heading, is_home); " VALUES (%u, %u, %u, %f, %f, %f, %f, %i)", character_id, zone_id, instance_id, x, y, z, heading, is_home);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterBindPoint for character ID: %i zone_id: %u instance_id: %u x: %f y: %f z: %f heading: %f ishome: %u", character_id, zone_id, instance_id, x, y, z, heading, is_home); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterBindPoint for character ID: %i zone_id: %u instance_id: %u x: %f y: %f z: %f heading: %f ishome: %u", character_id, zone_id, instance_id, x, y, z, heading, is_home);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.RowsAffected()) { if (!results.RowsAffected()) {
logger.LogDebug(EQEmuLogSys::General, "ERROR Bind Home Save: %s. %s", results.ErrorMessage().c_str(), query.c_str()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ERROR Bind Home Save: %s. %s", results.ErrorMessage().c_str(), query.c_str());
} }
return true; return true;
} }
@ -1245,20 +1245,20 @@ bool ZoneDatabase::SaveCharacterMaterialColor(uint32 character_id, uint32 slot_i
uint8 blue = (color & 0x000000FF); uint8 blue = (color & 0x000000FF);
std::string query = StringFormat("REPLACE INTO `character_material` (id, slot, red, green, blue, color, use_tint) VALUES (%u, %u, %u, %u, %u, %u, 255)", character_id, slot_id, red, green, blue, color); auto results = QueryDatabase(query); std::string query = StringFormat("REPLACE INTO `character_material` (id, slot, red, green, blue, color, use_tint) VALUES (%u, %u, %u, %u, %u, %u, 255)", character_id, slot_id, red, green, blue, color); auto results = QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterMaterialColor for character ID: %i, slot_id: %u color: %u done", character_id, slot_id, color); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterMaterialColor for character ID: %i, slot_id: %u color: %u done", character_id, slot_id, color);
return true; return true;
} }
bool ZoneDatabase::SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value){ bool ZoneDatabase::SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value){
std::string query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, skill_id, value); auto results = QueryDatabase(query); std::string query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, skill_id, value); auto results = QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterSkill for character ID: %i, skill_id:%u value:%u done", character_id, skill_id, value); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterSkill for character ID: %i, skill_id:%u value:%u done", character_id, skill_id, value);
return true; return true;
} }
bool ZoneDatabase::SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id){ bool ZoneDatabase::SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id){
std::string query = StringFormat("REPLACE INTO `character_disciplines` (id, slot_id, disc_id) VALUES (%u, %u, %u)", character_id, slot_id, disc_id); std::string query = StringFormat("REPLACE INTO `character_disciplines` (id, slot_id, disc_id) VALUES (%u, %u, %u)", character_id, slot_id, disc_id);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterDisc for character ID: %i, slot:%u disc_id:%u done", character_id, slot_id, disc_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterDisc for character ID: %i, slot:%u disc_id:%u done", character_id, slot_id, disc_id);
return true; return true;
} }
@ -1270,7 +1270,7 @@ bool ZoneDatabase::SaveCharacterTribute(uint32 character_id, PlayerProfile_Struc
if (pp->tributes[i].tribute > 0 && pp->tributes[i].tribute != TRIBUTE_NONE){ if (pp->tributes[i].tribute > 0 && pp->tributes[i].tribute != TRIBUTE_NONE){
std::string query = StringFormat("REPLACE INTO `character_tribute` (id, tier, tribute) VALUES (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute); std::string query = StringFormat("REPLACE INTO `character_tribute` (id, tier, tribute) VALUES (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
QueryDatabase(query); QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterTribute for character ID: %i, tier:%u tribute:%u done", character_id, pp->tributes[i].tier, pp->tributes[i].tribute); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterTribute for character ID: %i, tier:%u tribute:%u done", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
} }
} }
return true; return true;
@ -1281,7 +1281,7 @@ bool ZoneDatabase::SaveCharacterBandolier(uint32 character_id, uint8 bandolier_i
DoEscapeString(bandolier_name_esc, bandolier_name, strlen(bandolier_name)); DoEscapeString(bandolier_name_esc, bandolier_name, strlen(bandolier_name));
std::string query = StringFormat("REPLACE INTO `character_bandolier` (id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name) VALUES (%u, %u, %u, %u, %u,'%s')", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name_esc); std::string query = StringFormat("REPLACE INTO `character_bandolier` (id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name) VALUES (%u, %u, %u, %u, %u,'%s')", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name_esc);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterBandolier for character ID: %i, bandolier_id: %u, bandolier_slot: %u item_id: %u, icon:%u band_name:%s done", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterBandolier for character ID: %i, bandolier_id: %u, bandolier_slot: %u item_id: %u, icon:%u band_name:%s done", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name);
if (!results.RowsAffected()){ std::cout << "ERROR Bandolier Save: " << results.ErrorMessage() << "\n\n" << query << "\n" << std::endl; } if (!results.RowsAffected()){ std::cout << "ERROR Bandolier Save: " << results.ErrorMessage() << "\n\n" << query << "\n" << std::endl; }
return true; return true;
} }
@ -1596,7 +1596,7 @@ bool ZoneDatabase::SaveCharacterData(uint32 character_id, uint32 account_id, Pla
m_epp->expended_aa m_epp->expended_aa
); );
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "ZoneDatabase::SaveCharacterData %i, done... Took %f seconds", character_id, ((float)(std::clock() - t)) / CLOCKS_PER_SEC); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "ZoneDatabase::SaveCharacterData %i, done... Took %f seconds", character_id, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
return true; return true;
} }
@ -1637,7 +1637,7 @@ bool ZoneDatabase::SaveCharacterCurrency(uint32 character_id, PlayerProfile_Stru
pp->currentEbonCrystals, pp->currentEbonCrystals,
pp->careerEbonCrystals); pp->careerEbonCrystals);
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
logger.LogDebug(EQEmuLogSys::General, "Saving Currency for character ID: %i, done", character_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Saving Currency for character ID: %i, done", character_id);
return true; return true;
} }
@ -1646,7 +1646,7 @@ bool ZoneDatabase::SaveCharacterAA(uint32 character_id, uint32 aa_id, uint32 cur
" VALUES (%u, %u, %u)", " VALUES (%u, %u, %u)",
character_id, aa_id, current_level); character_id, aa_id, current_level);
auto results = QueryDatabase(rquery); auto results = QueryDatabase(rquery);
logger.LogDebug(EQEmuLogSys::General, "Saving AA for character ID: %u, aa_id: %u current_level: %u", character_id, aa_id, current_level); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Saving AA for character ID: %u, aa_id: %u current_level: %u", character_id, aa_id, current_level);
return true; return true;
} }

10
zone/zoning.cpp
View File

@ -44,12 +44,12 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
zoning = true; zoning = true;
if (app->size != sizeof(ZoneChange_Struct)) { if (app->size != sizeof(ZoneChange_Struct)) {
logger.LogDebug(EQEmuLogSys::General, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct)); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct));
return; return;
} }
#if EQDEBUG >= 5 #if EQDEBUG >= 5
logger.LogDebug(EQEmuLogSys::General, "Zone request from %s", GetName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Zone request from %s", GetName());
DumpPacket(app); DumpPacket(app);
#endif #endif
ZoneChange_Struct* zc=(ZoneChange_Struct*)app->pBuffer; ZoneChange_Struct* zc=(ZoneChange_Struct*)app->pBuffer;
@ -193,7 +193,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
switch(zone_mode) { switch(zone_mode) {
case EvacToSafeCoords: case EvacToSafeCoords:
case ZoneToSafeCoords: case ZoneToSafeCoords:
logger.LogDebug(EQEmuLogSys::General, "Zoning %s to safe coords (%f,%f,%f) in %s (%d)", GetName(), safe_x, safe_y, safe_z, target_zone_name, target_zone_id); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "Zoning %s to safe coords (%f,%f,%f) in %s (%d)", GetName(), safe_x, safe_y, safe_z, target_zone_name, target_zone_id);
dest_x = safe_x; dest_x = safe_x;
dest_y = safe_y; dest_y = safe_y;
dest_z = safe_z; dest_z = safe_z;
@ -534,7 +534,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
heading = m_pp.binds[0].heading; heading = m_pp.binds[0].heading;
zonesummon_ignorerestrictions = 1; zonesummon_ignorerestrictions = 1;
logger.LogDebug(EQEmuLogSys::General, "Player %s has died and will be zoned to bind point in zone: %s at LOC x=%f, y=%f, z=%f, heading=%f", GetName(), pZoneName, m_pp.binds[0].x, m_pp.binds[0].y, m_pp.binds[0].z, m_pp.binds[0].heading); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::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", GetName(), pZoneName, m_pp.binds[0].x, m_pp.binds[0].y, m_pp.binds[0].z, m_pp.binds[0].heading);
break; break;
case SummonPC: case SummonPC:
zonesummon_x = x_pos = x; zonesummon_x = x_pos = x;
@ -543,7 +543,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
SetHeading(heading); SetHeading(heading);
break; break;
case Rewind: case Rewind:
logger.LogDebug(EQEmuLogSys::General, "%s has requested a /rewind from %f, %f, %f, to %f, %f, %f in %s", GetName(), x_pos, y_pos, z_pos, rewind_x, rewind_y, rewind_z, zone->GetShortName()); logger.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::None, "%s has requested a /rewind from %f, %f, %f, to %f, %f, %f in %s", GetName(), x_pos, y_pos, z_pos, rewind_x, rewind_y, rewind_z, zone->GetShortName());
zonesummon_x = x_pos = x; zonesummon_x = x_pos = x;
zonesummon_y = y_pos = y; zonesummon_y = y_pos = y;
zonesummon_z = z_pos = z; zonesummon_z = z_pos = z;