pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix spacing

Browse Source
This commit is contained in:
Akkadius
2015-01-10 15:47:36 -06:00
parent 6844645dfb
commit b76e179d75
39 changed files with 409 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+104 -104
View File
@@ -431,7 +431,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 1, &args);
#if EQDEBUG >= 10
logger.Log(EQEmuLogSys::Error,"HandlePacket() Opcode error: Unexpected packet during CLIENT_CONNECTING: opcode:"
logger.Log(EQEmuLogSys::Error, "HandlePacket() Opcode error: Unexpected packet during CLIENT_CONNECTING: opcode:"
" %s (#%d eq=0x%04x), size: %i", OpcodeNames[opcode], opcode, 0, app->size);
DumpPacket(app);
#endif
@@ -966,7 +966,7 @@ return;
void Client::Handle_Connect_OP_ApproveZone(const EQApplicationPacket *app)
{
if (app->size != sizeof(ApproveZone_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_ApproveZone: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_ApproveZone: Expected %i, Got %i",
sizeof(ApproveZone_Struct), app->size);
return;
}
@@ -979,14 +979,14 @@ void Client::Handle_Connect_OP_ApproveZone(const EQApplicationPacket *app)
void Client::Handle_Connect_OP_ClientError(const EQApplicationPacket *app)
{
if (app->size != sizeof(ClientError_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_ClientError: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_ClientError: Expected %i, Got %i",
sizeof(ClientError_Struct), app->size);
return;
}
// Client reporting error to server
ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
logger.Log(EQEmuLogSys::Error,"Client error: %s", error->character_name);
logger.Log(EQEmuLogSys::Error,"Error message: %s", error->message);
logger.Log(EQEmuLogSys::Error, "Client error: %s", error->character_name);
logger.Log(EQEmuLogSys::Error, "Error message: %s", error->message);
Message(13, error->message);
#if (EQDEBUG>=5)
DumpPacket(app);
@@ -1180,7 +1180,7 @@ void Client::Handle_Connect_OP_SendTributes(const EQApplicationPacket *app)
void Client::Handle_Connect_OP_SetServerFilter(const EQApplicationPacket *app)
{
if (app->size != sizeof(SetServerFilter_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized OP_SetServerFilter");
logger.Log(EQEmuLogSys::Error, "Received invalid sized OP_SetServerFilter");
DumpPacket(app);
return;
}
@@ -1197,7 +1197,7 @@ void Client::Handle_Connect_OP_SpawnAppearance(const EQApplicationPacket *app)
void Client::Handle_Connect_OP_TGB(const EQApplicationPacket *app)
{
if (app->size != sizeof(uint32)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_TGB: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_TGB: Expected %i, Got %i",
sizeof(uint32), app->size);
return;
}
@@ -1324,7 +1324,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
*/
Client* client = entity_list.GetClientByName(cze->char_name);
if (!zone->GetAuth(ip, cze->char_name, &WID, &account_id, &character_id, &admin, lskey, &tellsoff)) {
logger.Log(EQEmuLogSys::Error,"GetAuth() returned false kicking client");
logger.Log(EQEmuLogSys::Error, "GetAuth() returned false kicking client");
if (client != 0) {
client->Save();
client->Kick();
@@ -1729,7 +1729,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
p_timers.SetCharID(CharacterID());
if (!p_timers.Load(&database)) {
logger.Log(EQEmuLogSys::Error,"Unable to load ability timers from the database for %s (%i)!", GetCleanName(), CharacterID());
logger.Log(EQEmuLogSys::Error, "Unable to load ability timers from the database for %s (%i)!", GetCleanName(), CharacterID());
}
/* Load Spell Slot Refresh from Currently Memoried Spells */
@@ -1956,7 +1956,7 @@ void Client::Handle_OP_AdventureInfoRequest(const EQApplicationPacket *app)
{
if (app->size < sizeof(EntityId_Struct))
{
logger.Log(EQEmuLogSys::Error,"Handle_OP_AdventureInfoRequest had a packet that was too small.");
logger.Log(EQEmuLogSys::Error, "Handle_OP_AdventureInfoRequest had a packet that was too small.");
return;
}
EntityId_Struct* ent = (EntityId_Struct*)app->pBuffer;
@@ -2011,7 +2011,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
{
if (app->size != sizeof(Adventure_Purchase_Struct))
{
logger.Log(EQEmuLogSys::Error,"OP size error: OP_AdventureMerchantPurchase expected:%i got:%i", sizeof(Adventure_Purchase_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_AdventureMerchantPurchase expected:%i got:%i", sizeof(Adventure_Purchase_Struct), app->size);
return;
}
@@ -2191,7 +2191,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(AdventureMerchant_Struct))
{
logger.Log(EQEmuLogSys::Error,"OP size error: OP_AdventureMerchantRequest expected:%i got:%i", sizeof(AdventureMerchant_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_AdventureMerchantRequest expected:%i got:%i", sizeof(AdventureMerchant_Struct), app->size);
return;
}
std::stringstream ss(std::stringstream::in | std::stringstream::out);
@@ -2413,7 +2413,7 @@ void Client::Handle_OP_AdventureRequest(const EQApplicationPacket *app)
{
if (app->size < sizeof(AdventureRequest_Struct))
{
logger.Log(EQEmuLogSys::Error,"Handle_OP_AdventureRequest had a packet that was too small.");
logger.Log(EQEmuLogSys::Error, "Handle_OP_AdventureRequest had a packet that was too small.");
return;
}
@@ -2939,7 +2939,7 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app)
void Client::Handle_OP_Animation(const EQApplicationPacket *app)
{
if (app->size != sizeof(Animation_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized "
logger.Log(EQEmuLogSys::Error, "Received invalid sized "
"OP_Animation: got %d, expected %d", app->size,
sizeof(Animation_Struct));
DumpPacket(app);
@@ -2958,7 +2958,7 @@ void Client::Handle_OP_Animation(const EQApplicationPacket *app)
void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
{
if (app->size != sizeof(ApplyPoison_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_ApplyPoison, size=%i, expected %i", app->size, sizeof(ApplyPoison_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_ApplyPoison, size=%i, expected %i", app->size, sizeof(ApplyPoison_Struct));
DumpPacket(app);
return;
}
@@ -3072,7 +3072,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app)
void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
{
if (app->size != sizeof(AugmentItem_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for AugmentItem_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for AugmentItem_Struct: Expected: %i, Got: %i",
sizeof(AugmentItem_Struct), app->size);
return;
}
@@ -3229,7 +3229,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
void Client::Handle_OP_AutoAttack(const EQApplicationPacket *app)
{
if (app->size != 4) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_AutoAttack expected:4 got:%i", app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_AutoAttack expected:4 got:%i", app->size);
return;
}
@@ -3581,7 +3581,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app)
{
if (app->size != sizeof(BazaarInspect_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for BazaarInspect_Struct: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for BazaarInspect_Struct: Expected %i, Got %i",
sizeof(BazaarInspect_Struct), app->size);
return;
}
@@ -3637,7 +3637,7 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app)
}
else {
_log(TRADING__CLIENT, "Malformed BazaarSearch_Struct packe, Action %it received, ignoring...");
logger.Log(EQEmuLogSys::Error,"Malformed BazaarSearch_Struct packet received, ignoring...\n");
logger.Log(EQEmuLogSys::Error, "Malformed BazaarSearch_Struct packet received, ignoring...\n");
}
return;
@@ -3722,13 +3722,13 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app)
void Client::Handle_OP_Bind_Wound(const EQApplicationPacket *app)
{
if (app->size != sizeof(BindWound_Struct)){
logger.Log(EQEmuLogSys::Error,"Size mismatch for Bind wound packet");
logger.Log(EQEmuLogSys::Error, "Size mismatch for Bind wound packet");
DumpPacket(app);
}
BindWound_Struct* bind_in = (BindWound_Struct*)app->pBuffer;
Mob* bindmob = entity_list.GetMob(bind_in->to);
if (!bindmob){
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 {
logger.LogDebug(EQEmuLogSys::General, "BindWound in: to:\'%s\' from=\'%s\'", bindmob->GetName(), GetName());
@@ -3839,7 +3839,7 @@ void Client::Handle_OP_BoardBoat(const EQApplicationPacket *app)
// this sends unclean mob name, so capped at 64
// a_boat006
if (app->size <= 5 || app->size > 64) {
logger.Log(EQEmuLogSys::Error,"Size mismatch in OP_BoardBoad. Expected greater than 5 less than 64, got %i", app->size);
logger.Log(EQEmuLogSys::Error, "Size mismatch in OP_BoardBoad. Expected greater than 5 less than 64, got %i", app->size);
DumpPacket(app);
return;
}
@@ -3860,7 +3860,7 @@ void Client::Handle_OP_Buff(const EQApplicationPacket *app)
{
if (app->size != sizeof(SpellBuffFade_Struct))
{
logger.Log(EQEmuLogSys::Error,"Size mismatch in OP_Buff. expected %i got %i", sizeof(SpellBuffFade_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "Size mismatch in OP_Buff. expected %i got %i", sizeof(SpellBuffFade_Struct), app->size);
DumpPacket(app);
return;
}
@@ -3956,7 +3956,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app)
void Client::Handle_OP_CancelTrade(const EQApplicationPacket *app)
{
if (app->size != sizeof(CancelTrade_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_CancelTrade, size=%i, expected %i", app->size, sizeof(CancelTrade_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_CancelTrade, size=%i, expected %i", app->size, sizeof(CancelTrade_Struct));
return;
}
Mob* with = trade->With();
@@ -4235,7 +4235,7 @@ void Client::Handle_OP_ClearSurname(const EQApplicationPacket *app)
void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app)
{
if (app->size != sizeof(ClickDoor_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_ClickDoor, size=%i, expected %i", app->size, sizeof(ClickDoor_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_ClickDoor, size=%i, expected %i", app->size, sizeof(ClickDoor_Struct));
return;
}
ClickDoor_Struct* cd = (ClickDoor_Struct*)app->pBuffer;
@@ -4260,7 +4260,7 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app)
void Client::Handle_OP_ClickObject(const EQApplicationPacket *app)
{
if (app->size != sizeof(ClickObject_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on ClickObject_Struct: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on ClickObject_Struct: Expected %i, Got %i",
sizeof(ClickObject_Struct), app->size);
return;
}
@@ -4311,7 +4311,7 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
else
{
if (app->size != sizeof(ClickObjectAction_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_ClickObjectAction: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_ClickObjectAction: Expected %i, Got %i",
sizeof(ClickObjectAction_Struct), app->size);
return;
}
@@ -4324,11 +4324,11 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
object->Close();
}
else {
logger.Log(EQEmuLogSys::Error,"Unsupported action %d in OP_ClickObjectAction", oos->open);
logger.Log(EQEmuLogSys::Error, "Unsupported action %d in OP_ClickObjectAction", oos->open);
}
}
else {
logger.Log(EQEmuLogSys::Error,"Invalid object %d in OP_ClickObjectAction", oos->drop_id);
logger.Log(EQEmuLogSys::Error, "Invalid object %d in OP_ClickObjectAction", oos->drop_id);
}
}
@@ -4345,8 +4345,8 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
void Client::Handle_OP_ClientError(const EQApplicationPacket *app)
{
ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
logger.Log(EQEmuLogSys::Error,"Client error: %s", error->character_name);
logger.Log(EQEmuLogSys::Error,"Error message:%s", error->message);
logger.Log(EQEmuLogSys::Error, "Client error: %s", error->character_name);
logger.Log(EQEmuLogSys::Error, "Error message:%s", error->message);
return;
}
@@ -4367,7 +4367,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app)
if (app->size != sizeof(PlayerPositionUpdateClient_Struct)
&& app->size != (sizeof(PlayerPositionUpdateClient_Struct)+1)
) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_ClientUpdate expected:%i got:%i", sizeof(PlayerPositionUpdateClient_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_ClientUpdate expected:%i got:%i", sizeof(PlayerPositionUpdateClient_Struct), app->size);
return;
}
PlayerPositionUpdateClient_Struct* ppu = (PlayerPositionUpdateClient_Struct*)app->pBuffer;
@@ -4873,7 +4873,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
{
if (app->size != sizeof(Consume_Struct))
{
logger.Log(EQEmuLogSys::Error,"OP size error: OP_Consume expected:%i got:%i", sizeof(Consume_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_Consume expected:%i got:%i", sizeof(Consume_Struct), app->size);
return;
}
Consume_Struct* pcs = (Consume_Struct*)app->pBuffer;
@@ -4910,7 +4910,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
ItemInst *myitem = GetInv().GetItem(pcs->slot);
if (myitem == nullptr) {
logger.Log(EQEmuLogSys::Error,"Consuming from empty slot %d", pcs->slot);
logger.Log(EQEmuLogSys::Error, "Consuming from empty slot %d", pcs->slot);
return;
}
@@ -4922,7 +4922,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
Consume(eat_item, ItemTypeDrink, pcs->slot, (pcs->auto_consumed == 0xffffffff));
}
else {
logger.Log(EQEmuLogSys::Error,"OP_Consume: unknown type, type:%i", (int)pcs->type);
logger.Log(EQEmuLogSys::Error, "OP_Consume: unknown type, type:%i", (int)pcs->type);
return;
}
if (m_pp.hunger_level > 50000)
@@ -4943,7 +4943,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app)
{
if (app->size != sizeof(ControlBoat_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_ControlBoat, size=%i, expected %i", app->size, sizeof(ControlBoat_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_ControlBoat, size=%i, expected %i", app->size, sizeof(ControlBoat_Struct));
return;
}
ControlBoat_Struct* cbs = (ControlBoat_Struct*)app->pBuffer;
@@ -5099,7 +5099,7 @@ void Client::Handle_OP_CrystalReclaim(const EQApplicationPacket *app)
void Client::Handle_OP_Damage(const EQApplicationPacket *app)
{
if (app->size != sizeof(CombatDamage_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized OP_Damage: got %d, expected %d", app->size,
logger.Log(EQEmuLogSys::Error, "Received invalid sized OP_Damage: got %d, expected %d", app->size,
sizeof(CombatDamage_Struct));
DumpPacket(app);
return;
@@ -5447,7 +5447,7 @@ void Client::Handle_OP_Dye(const EQApplicationPacket *app)
void Client::Handle_OP_Emote(const EQApplicationPacket *app)
{
if (app->size != sizeof(Emote_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized "
logger.Log(EQEmuLogSys::Error, "Received invalid sized "
"OP_Emote: got %d, expected %d", app->size,
sizeof(Emote_Struct));
DumpPacket(app);
@@ -5538,7 +5538,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
}
if (app->size != sizeof(EnvDamage2_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized OP_EnvDamage: got %d, expected %d", app->size,
logger.Log(EQEmuLogSys::Error, "Received invalid sized OP_EnvDamage: got %d, expected %d", app->size,
sizeof(EnvDamage2_Struct));
DumpPacket(app);
return;
@@ -5593,7 +5593,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
void Client::Handle_OP_FaceChange(const EQApplicationPacket *app)
{
if (app->size != sizeof(FaceChange_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for OP_FaceChange: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for OP_FaceChange: Expected: %i, Got: %i",
sizeof(FaceChange_Struct), app->size);
return;
}
@@ -5862,7 +5862,7 @@ void Client::Handle_OP_GMBecomeNPC(const EQApplicationPacket *app)
return;
}
if (app->size != sizeof(BecomeNPC_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMBecomeNPC, size=%i, expected %i", app->size, sizeof(BecomeNPC_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMBecomeNPC, size=%i, expected %i", app->size, sizeof(BecomeNPC_Struct));
return;
}
//entity_list.QueueClients(this, app, false);
@@ -5914,7 +5914,7 @@ void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
return;
}
if (app->size != sizeof(GMEmoteZone_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMEmoteZone, size=%i, expected %i", app->size, sizeof(GMEmoteZone_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMEmoteZone, size=%i, expected %i", app->size, sizeof(GMEmoteZone_Struct));
return;
}
GMEmoteZone_Struct* gmez = (GMEmoteZone_Struct*)app->pBuffer;
@@ -5947,7 +5947,7 @@ void Client::Handle_OP_GMFind(const EQApplicationPacket *app)
return;
}
if (app->size != sizeof(GMSummon_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMFind, size=%i, expected %i", app->size, sizeof(GMSummon_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMFind, size=%i, expected %i", app->size, sizeof(GMSummon_Struct));
return;
}
//Break down incoming
@@ -6012,7 +6012,7 @@ void Client::Handle_OP_GMHideMe(const EQApplicationPacket *app)
return;
}
if (app->size != sizeof(SpawnAppearance_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMHideMe, size=%i, expected %i", app->size, sizeof(SpawnAppearance_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMHideMe, size=%i, expected %i", app->size, sizeof(SpawnAppearance_Struct));
return;
}
SpawnAppearance_Struct* sa = (SpawnAppearance_Struct*)app->pBuffer;
@@ -6062,7 +6062,7 @@ void Client::Handle_OP_GMKill(const EQApplicationPacket *app)
return;
}
if (app->size != sizeof(GMKill_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMKill, size=%i, expected %i", app->size, sizeof(GMKill_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMKill, size=%i, expected %i", app->size, sizeof(GMKill_Struct));
return;
}
GMKill_Struct* gmk = (GMKill_Struct *)app->pBuffer;
@@ -6129,7 +6129,7 @@ void Client::Handle_OP_GMLastName(const EQApplicationPacket *app)
void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
{
if (app->size != sizeof(GMName_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GMNameChange, size=%i, expected %i", app->size, sizeof(GMName_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GMNameChange, size=%i, expected %i", app->size, sizeof(GMName_Struct));
return;
}
const GMName_Struct* gmn = (const GMName_Struct *)app->pBuffer;
@@ -6383,7 +6383,7 @@ void Client::Handle_OP_GMZoneRequest2(const EQApplicationPacket *app)
return;
}
if (app->size < sizeof(uint32)) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_GMZoneRequest2 expected:%i got:%i", sizeof(uint32), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_GMZoneRequest2 expected:%i got:%i", sizeof(uint32), app->size);
return;
}
@@ -6400,7 +6400,7 @@ void Client::Handle_OP_GroupAcknowledge(const EQApplicationPacket *app)
void Client::Handle_OP_GroupCancelInvite(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupCancel_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for OP_GroupCancelInvite: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for OP_GroupCancelInvite: Expected: %i, Got: %i",
sizeof(GroupCancel_Struct), app->size);
return;
}
@@ -6444,7 +6444,7 @@ void Client::Handle_OP_GroupDelete(const EQApplicationPacket *app)
void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupGeneric_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for GroupGeneric_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for GroupGeneric_Struct: Expected: %i, Got: %i",
sizeof(GroupGeneric_Struct), app->size);
return;
}
@@ -6591,7 +6591,7 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
}
else
{
logger.Log(EQEmuLogSys::Error,"Failed to remove player from group. Unable to find player named %s in player group", gd->name2);
logger.Log(EQEmuLogSys::Error, "Failed to remove player from group. Unable to find player named %s in player group", gd->name2);
}
}
if (LFP)
@@ -6611,7 +6611,7 @@ void Client::Handle_OP_GroupFollow(const EQApplicationPacket *app)
void Client::Handle_OP_GroupFollow2(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupGeneric_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for OP_GroupFollow: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for OP_GroupFollow: Expected: %i, Got: %i",
sizeof(GroupGeneric_Struct), app->size);
return;
}
@@ -6660,7 +6660,7 @@ void Client::Handle_OP_GroupInvite(const EQApplicationPacket *app)
void Client::Handle_OP_GroupInvite2(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupInvite_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for OP_GroupInvite: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for OP_GroupInvite: Expected: %i, Got: %i",
sizeof(GroupInvite_Struct), app->size);
return;
}
@@ -6738,7 +6738,7 @@ void Client::Handle_OP_GroupMakeLeader(const EQApplicationPacket *app)
void Client::Handle_OP_GroupMentor(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupMentor_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GroupMentor, size=%i, expected %i", app->size, sizeof(GroupMentor_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GroupMentor, size=%i, expected %i", app->size, sizeof(GroupMentor_Struct));
DumpPacket(app);
return;
}
@@ -6774,7 +6774,7 @@ void Client::Handle_OP_GroupMentor(const EQApplicationPacket *app)
void Client::Handle_OP_GroupRoles(const EQApplicationPacket *app)
{
if (app->size != sizeof(GroupRole_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GroupRoles, size=%i, expected %i", app->size, sizeof(GroupRole_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GroupRoles, size=%i, expected %i", app->size, sizeof(GroupRole_Struct));
DumpPacket(app);
return;
}
@@ -6868,7 +6868,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
}
if (app->size < sizeof(uint32)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_GuildBank, size=%i, expected %i", app->size, sizeof(uint32));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_GuildBank, size=%i, expected %i", app->size, sizeof(uint32));
DumpPacket(app);
return;
}
@@ -7989,7 +7989,7 @@ void Client::Handle_OP_Ignore(const EQApplicationPacket *app)
void Client::Handle_OP_Illusion(const EQApplicationPacket *app)
{
if (app->size != sizeof(Illusion_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized OP_Illusion: got %d, expected %d", app->size,
logger.Log(EQEmuLogSys::Error, "Received invalid sized OP_Illusion: got %d, expected %d", app->size,
sizeof(Illusion_Struct));
DumpPacket(app);
return;
@@ -8019,7 +8019,7 @@ void Client::Handle_OP_InspectAnswer(const EQApplicationPacket *app)
{
if (app->size != sizeof(InspectResponse_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_InspectAnswer, size=%i, expected %i", app->size, sizeof(InspectResponse_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_InspectAnswer, size=%i, expected %i", app->size, sizeof(InspectResponse_Struct));
return;
}
@@ -8074,7 +8074,7 @@ void Client::Handle_OP_InspectMessageUpdate(const EQApplicationPacket *app)
{
if (app->size != sizeof(InspectMessage_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_InspectMessageUpdate, size=%i, expected %i", app->size, sizeof(InspectMessage_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_InspectMessageUpdate, size=%i, expected %i", app->size, sizeof(InspectMessage_Struct));
return;
}
@@ -8088,7 +8088,7 @@ void Client::Handle_OP_InspectRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(Inspect_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_InspectRequest, size=%i, expected %i", app->size, sizeof(Inspect_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_InspectRequest, size=%i, expected %i", app->size, sizeof(Inspect_Struct));
return;
}
@@ -8125,7 +8125,7 @@ void Client::Handle_OP_InstillDoubt(const EQApplicationPacket *app)
void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
{
if (app->size != sizeof(ItemViewRequest_Struct)){
logger.Log(EQEmuLogSys::Error,"Wrong size on OP_ItemLinkClick. Got: %i, Expected: %i", app->size, sizeof(ItemViewRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size on OP_ItemLinkClick. Got: %i, Expected: %i", app->size, sizeof(ItemViewRequest_Struct));
DumpPacket(app);
return;
}
@@ -8225,7 +8225,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
void Client::Handle_OP_ItemLinkResponse(const EQApplicationPacket *app)
{
if (app->size != sizeof(LDONItemViewRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_ItemLinkResponse expected:%i got:%i", sizeof(LDONItemViewRequest_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_ItemLinkResponse expected:%i got:%i", sizeof(LDONItemViewRequest_Struct), app->size);
return;
}
LDONItemViewRequest_Struct* item = (LDONItemViewRequest_Struct*)app->pBuffer;
@@ -8240,7 +8240,7 @@ void Client::Handle_OP_ItemLinkResponse(const EQApplicationPacket *app)
void Client::Handle_OP_ItemName(const EQApplicationPacket *app)
{
if (app->size != sizeof(ItemNamePacket_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for ItemNamePacket_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for ItemNamePacket_Struct: Expected: %i, Got: %i",
sizeof(ItemNamePacket_Struct), app->size);
return;
}
@@ -8438,7 +8438,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(ItemVerifyRequest_Struct))
{
logger.Log(EQEmuLogSys::Error,"OP size error: OP_ItemVerifyRequest expected:%i got:%i", sizeof(ItemVerifyRequest_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_ItemVerifyRequest expected:%i got:%i", sizeof(ItemVerifyRequest_Struct), app->size);
return;
}
@@ -8891,7 +8891,7 @@ void Client::Handle_OP_LFGGetMatchesRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(LFGGetMatchesRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_LFGGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFGGetMatchesRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_LFGGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFGGetMatchesRequest_Struct));
DumpPacket(app);
return;
}
@@ -9051,7 +9051,7 @@ void Client::Handle_OP_LFPCommand(const EQApplicationPacket *app)
{
if (app->size != sizeof(LFP_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_LFPCommand, size=%i, expected %i", app->size, sizeof(LFP_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_LFPCommand, size=%i, expected %i", app->size, sizeof(LFP_Struct));
DumpPacket(app);
return;
}
@@ -9088,7 +9088,7 @@ void Client::Handle_OP_LFPCommand(const EQApplicationPacket *app)
// This should not happen. The client checks if you are in a group and will not let you put LFP on if
// you are not the leader.
if (!g->IsLeader(this)) {
logger.Log(EQEmuLogSys::Error,"Client sent LFP on for character %s who is grouped but not leader.", GetName());
logger.Log(EQEmuLogSys::Error, "Client sent LFP on for character %s who is grouped but not leader.", GetName());
return;
}
// Fill the LFPMembers array with the rest of the group members, excluding ourself
@@ -9113,7 +9113,7 @@ void Client::Handle_OP_LFPGetMatchesRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(LFPGetMatchesRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_LFPGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFPGetMatchesRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_LFPGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFPGetMatchesRequest_Struct));
DumpPacket(app);
return;
}
@@ -9169,7 +9169,7 @@ void Client::Handle_OP_Logout(const EQApplicationPacket *app)
void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
{
if (app->size != sizeof(LootingItem_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_LootItem, size=%i, expected %i", app->size, sizeof(LootingItem_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_LootItem, size=%i, expected %i", app->size, sizeof(LootingItem_Struct));
return;
}
@@ -9717,7 +9717,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
void Client::Handle_OP_MoveCoin(const EQApplicationPacket *app)
{
if (app->size != sizeof(MoveCoin_Struct)){
logger.Log(EQEmuLogSys::Error,"Wrong size on OP_MoveCoin. Got: %i, Expected: %i", app->size, sizeof(MoveCoin_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size on OP_MoveCoin. Got: %i, Expected: %i", app->size, sizeof(MoveCoin_Struct));
DumpPacket(app);
return;
}
@@ -9733,7 +9733,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
}
if (app->size != sizeof(MoveItem_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_MoveItem, size=%i, expected %i", app->size, sizeof(MoveItem_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_MoveItem, size=%i, expected %i", app->size, sizeof(MoveItem_Struct));
return;
}
@@ -9875,7 +9875,7 @@ void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app)
void Client::Handle_OP_PDeletePetition(const EQApplicationPacket *app)
{
if (app->size < 2) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_PDeletePetition, size=%i, expected %i", app->size, 2);
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_PDeletePetition, size=%i, expected %i", app->size, 2);
return;
}
if (petition_list.DeletePetitionByCharName((char*)app->pBuffer))
@@ -9888,7 +9888,7 @@ void Client::Handle_OP_PDeletePetition(const EQApplicationPacket *app)
void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
{
if (app->size != sizeof(PetCommand_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_PetCommands, size=%i, expected %i", app->size, sizeof(PetCommand_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_PetCommands, size=%i, expected %i", app->size, sizeof(PetCommand_Struct));
return;
}
char val1[20] = { 0 };
@@ -10351,7 +10351,7 @@ void Client::Handle_OP_PetitionBug(const EQApplicationPacket *app)
void Client::Handle_OP_PetitionCheckIn(const EQApplicationPacket *app)
{
if (app->size != sizeof(Petition_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_PetitionCheckIn, size=%i, expected %i", app->size, sizeof(Petition_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_PetitionCheckIn, size=%i, expected %i", app->size, sizeof(Petition_Struct));
return;
}
Petition_Struct* inpet = (Petition_Struct*)app->pBuffer;
@@ -10395,7 +10395,7 @@ void Client::Handle_OP_PetitionCheckout(const EQApplicationPacket *app)
void Client::Handle_OP_PetitionDelete(const EQApplicationPacket *app)
{
if (app->size != sizeof(PetitionUpdate_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_PetitionDelete, size=%i, expected %i", app->size, sizeof(PetitionUpdate_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_PetitionDelete, size=%i, expected %i", app->size, sizeof(PetitionUpdate_Struct));
return;
}
EQApplicationPacket* outapp = new EQApplicationPacket(OP_PetitionUpdate, sizeof(PetitionUpdate_Struct));
@@ -10465,7 +10465,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app)
{
if (app->size != sizeof(PickPocket_Struct))
{
logger.Log(EQEmuLogSys::Error,"Size mismatch for Pick Pocket packet");
logger.Log(EQEmuLogSys::Error, "Size mismatch for Pick Pocket packet");
DumpPacket(app);
}
@@ -10739,7 +10739,7 @@ void Client::Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app)
void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
{
if (app->size < sizeof(RaidGeneral_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_RaidCommand, size=%i, expected at least %i", app->size, sizeof(RaidGeneral_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_RaidCommand, size=%i, expected at least %i", app->size, sizeof(RaidGeneral_Struct));
DumpPacket(app);
return;
}
@@ -11324,7 +11324,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
void Client::Handle_OP_RandomReq(const EQApplicationPacket *app)
{
if (app->size != sizeof(RandomReq_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_RandomReq, size=%i, expected %i", app->size, sizeof(RandomReq_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_RandomReq, size=%i, expected %i", app->size, sizeof(RandomReq_Struct));
return;
}
const RandomReq_Struct* rndq = (const RandomReq_Struct*)app->pBuffer;
@@ -11353,7 +11353,7 @@ void Client::Handle_OP_RandomReq(const EQApplicationPacket *app)
void Client::Handle_OP_ReadBook(const EQApplicationPacket *app)
{
if (app->size != sizeof(BookRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_ReadBook, size=%i, expected %i", app->size, sizeof(BookRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_ReadBook, size=%i, expected %i", app->size, sizeof(BookRequest_Struct));
return;
}
BookRequest_Struct* book = (BookRequest_Struct*)app->pBuffer;
@@ -11369,7 +11369,7 @@ void Client::Handle_OP_ReadBook(const EQApplicationPacket *app)
void Client::Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app)
{
if (app->size != sizeof(RecipeAutoCombine_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for RecipeAutoCombine_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for RecipeAutoCombine_Struct: Expected: %i, Got: %i",
sizeof(RecipeAutoCombine_Struct), app->size);
return;
}
@@ -11383,7 +11383,7 @@ void Client::Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app)
void Client::Handle_OP_RecipeDetails(const EQApplicationPacket *app)
{
if (app->size < sizeof(uint32)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for RecipeDetails Request: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for RecipeDetails Request: Expected: %i, Got: %i",
sizeof(uint32), app->size);
return;
}
@@ -11397,7 +11397,7 @@ void Client::Handle_OP_RecipeDetails(const EQApplicationPacket *app)
void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
{
if (app->size != sizeof(TradeskillFavorites_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for TradeskillFavorites_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for TradeskillFavorites_Struct: Expected: %i, Got: %i",
sizeof(TradeskillFavorites_Struct), app->size);
return;
}
@@ -11456,7 +11456,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
{
if (app->size != sizeof(RecipesSearch_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for RecipesSearch_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for RecipesSearch_Struct: Expected: %i, Got: %i",
sizeof(RecipesSearch_Struct), app->size);
return;
}
@@ -11746,7 +11746,7 @@ void Client::Handle_OP_Sacrifice(const EQApplicationPacket *app)
Sacrifice_Struct *ss = (Sacrifice_Struct*)app->pBuffer;
if (!PendingSacrifice) {
logger.Log(EQEmuLogSys::Error,"Unexpected OP_Sacrifice reply");
logger.Log(EQEmuLogSys::Error, "Unexpected OP_Sacrifice reply");
DumpPacket(app);
return;
}
@@ -11790,7 +11790,7 @@ void Client::Handle_OP_SelectTribute(const EQApplicationPacket *app)
//we should enforce being near a real tribute master to change this
//but im not sure how I wanna do that right now.
if (app->size != sizeof(SelectTributeReq_Struct))
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_SelectTribute packet");
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_SelectTribute packet");
else {
SelectTributeReq_Struct *t = (SelectTributeReq_Struct *)app->pBuffer;
SendTributeDetails(t->client_id, t->tribute_id);
@@ -11904,7 +11904,7 @@ void Client::Handle_OP_SetRunMode(const EQApplicationPacket *app)
void Client::Handle_OP_SetServerFilter(const EQApplicationPacket *app)
{
if (app->size != sizeof(SetServerFilter_Struct)) {
logger.Log(EQEmuLogSys::Error,"Received invalid sized "
logger.Log(EQEmuLogSys::Error, "Received invalid sized "
"OP_SetServerFilter: got %d, expected %d", app->size,
sizeof(SetServerFilter_Struct));
DumpPacket(app);
@@ -11924,7 +11924,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
}
if (app->size < 1) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_SetStartCity, size=%i, expected %i", app->size, 1);
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_SetStartCity, size=%i, expected %i", app->size, 1);
DumpPacket(app);
return;
}
@@ -11938,7 +11938,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
m_pp.class_, m_pp.deity, m_pp.race);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
logger.Log(EQEmuLogSys::Error,"No valid start zones found for /setstartcity");
logger.Log(EQEmuLogSys::Error, "No valid start zones found for /setstartcity");
return;
}
@@ -12013,7 +12013,7 @@ void Client::Handle_OP_SetTitle(const EQApplicationPacket *app)
void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
{
if (app->size != sizeof(Shielding_Struct)) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_Shielding expected:%i got:%i", sizeof(Shielding_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_Shielding expected:%i got:%i", sizeof(Shielding_Struct), app->size);
return;
}
if (GetClass() != WARRIOR)
@@ -12110,7 +12110,7 @@ void Client::Handle_OP_ShopEnd(const EQApplicationPacket *app)
void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
{
if (app->size != sizeof(Merchant_Sell_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_ShopPlayerBuy: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_ShopPlayerBuy: Expected %i, Got %i",
sizeof(Merchant_Sell_Struct), app->size);
return;
}
@@ -12278,7 +12278,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
SendItemPacket(freeslotid, inst, ItemPacketTrade);
}
else if (!stacked){
logger.Log(EQEmuLogSys::Error,"OP_ShopPlayerBuy: item->ItemClass Unknown! Type: %i", item->ItemClass);
logger.Log(EQEmuLogSys::Error, "OP_ShopPlayerBuy: item->ItemClass Unknown! Type: %i", item->ItemClass);
}
QueuePacket(outapp);
if (inst && tmpmer_used){
@@ -12368,7 +12368,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
{
if (app->size != sizeof(Merchant_Purchase_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_ShopPlayerSell: Expected %i, Got %i",
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_ShopPlayerSell: Expected %i, Got %i",
sizeof(Merchant_Purchase_Struct), app->size);
return;
}
@@ -12524,7 +12524,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(Merchant_Click_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_ShopRequest, size=%i, expected %i", app->size, sizeof(Merchant_Click_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_ShopRequest, size=%i, expected %i", app->size, sizeof(Merchant_Click_Struct));
return;
}
@@ -12817,7 +12817,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
void Client::Handle_OP_Split(const EQApplicationPacket *app)
{
if (app->size != sizeof(Split_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_Split, size=%i, expected %i", app->size, sizeof(Split_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_Split, size=%i, expected %i", app->size, sizeof(Split_Struct));
return;
}
// The client removes the money on its own, but we have to
@@ -12944,7 +12944,7 @@ void Client::Handle_OP_SwapSpell(const EQApplicationPacket *app)
void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app)
{
if (app->size != sizeof(ClientTarget_Struct)) {
logger.Log(EQEmuLogSys::Error,"OP size error: OP_TargetMouse expected:%i got:%i", sizeof(ClientTarget_Struct), app->size);
logger.Log(EQEmuLogSys::Error, "OP size error: OP_TargetMouse expected:%i got:%i", sizeof(ClientTarget_Struct), app->size);
return;
}
@@ -13222,7 +13222,7 @@ void Client::Handle_OP_Track(const EQApplicationPacket *app)
CheckIncreaseSkill(SkillTracking, nullptr, 15);
if (!entity_list.MakeTrackPacket(this))
logger.Log(EQEmuLogSys::Error,"Unable to generate OP_Track packet requested by client.");
logger.Log(EQEmuLogSys::Error, "Unable to generate OP_Track packet requested by client.");
return;
}
@@ -13236,7 +13236,7 @@ void Client::Handle_OP_TrackTarget(const EQApplicationPacket *app)
if (app->size != sizeof(TrackTarget_Struct))
{
logger.Log(EQEmuLogSys::Error,"Invalid size for OP_TrackTarget: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for OP_TrackTarget: Expected: %i, Got: %i",
sizeof(TrackTarget_Struct), app->size);
return;
}
@@ -13389,7 +13389,7 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app)
void Client::Handle_OP_TradeBusy(const EQApplicationPacket *app)
{
if (app->size != sizeof(TradeBusy_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_TradeBusy, size=%i, expected %i", app->size, sizeof(TradeBusy_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_TradeBusy, size=%i, expected %i", app->size, sizeof(TradeBusy_Struct));
return;
}
// Trade request recipient is cancelling the trade due to being busy
@@ -13535,7 +13535,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
_log(TRADING__CLIENT, "Client::Handle_OP_Trader: Unknown TraderStruct code of: %i\n",
ints->Code);
logger.Log(EQEmuLogSys::Error,"Unknown TraderStruct code of: %i\n", ints->Code);
logger.Log(EQEmuLogSys::Error, "Unknown TraderStruct code of: %i\n", ints->Code);
}
}
@@ -13545,7 +13545,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
}
else {
_log(TRADING__CLIENT, "Unknown size for OP_Trader: %i\n", app->size);
logger.Log(EQEmuLogSys::Error,"Unknown size for OP_Trader: %i\n", app->size);
logger.Log(EQEmuLogSys::Error, "Unknown size for OP_Trader: %i\n", app->size);
DumpPacket(app);
return;
}
@@ -13583,7 +13583,7 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
{
if (app->size != sizeof(TradeRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_TradeRequest, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_TradeRequest, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
return;
}
// Client requesting a trade session from an npc/client
@@ -13619,7 +13619,7 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
void Client::Handle_OP_TradeRequestAck(const EQApplicationPacket *app)
{
if (app->size != sizeof(TradeRequest_Struct)) {
logger.Log(EQEmuLogSys::Error,"Wrong size: OP_TradeRequestAck, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
logger.Log(EQEmuLogSys::Error, "Wrong size: OP_TradeRequestAck, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
return;
}
// Trade request recipient is acknowledging they are able to trade
@@ -13690,7 +13690,7 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
void Client::Handle_OP_TradeSkillCombine(const EQApplicationPacket *app)
{
if (app->size != sizeof(NewCombine_Struct)) {
logger.Log(EQEmuLogSys::Error,"Invalid size for NewCombine_Struct: Expected: %i, Got: %i",
logger.Log(EQEmuLogSys::Error, "Invalid size for NewCombine_Struct: Expected: %i, Got: %i",
sizeof(NewCombine_Struct), app->size);
return;
}
@@ -13829,7 +13829,7 @@ void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app)
_pkt(TRIBUTE__IN, app);
if (app->size != sizeof(uint32))
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_TributeToggle packet");
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_TributeToggle packet");
else {
uint32 *val = (uint32 *)app->pBuffer;
ToggleTribute(*val ? true : false);
@@ -13844,7 +13844,7 @@ void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app)
//sent when the client changes their tribute settings...
if (app->size != sizeof(TributeInfo_Struct))
logger.Log(EQEmuLogSys::Error,"Invalid size on OP_TributeUpdate packet");
logger.Log(EQEmuLogSys::Error, "Invalid size on OP_TributeUpdate packet");
else {
TributeInfo_Struct *t = (TributeInfo_Struct *)app->pBuffer;
ChangeTributeSettings(t);