aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/PetHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
-rwxr-xr-xsrc/server/game/Handlers/PetHandler.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 062927eebc0..6f8f23dc8da 100755
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -32,10 +32,10 @@
#include "Group.h"
#include "SpellInfo.h"
-void WorldSession::HandleDismissCritter(WorldPacket &recv_data)
+void WorldSession::HandleDismissCritter(WorldPacket &recvData)
{
uint64 guid;
- recv_data >> guid;
+ recvData >> guid;
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_DISMISS_CRITTER for GUID " UI64FMTD, guid);
@@ -55,14 +55,14 @@ void WorldSession::HandleDismissCritter(WorldPacket &recv_data)
}
}
-void WorldSession::HandlePetAction(WorldPacket & recv_data)
+void WorldSession::HandlePetAction(WorldPacket & recvData)
{
uint64 guid1;
uint32 data;
uint64 guid2;
- recv_data >> guid1; //pet guid
- recv_data >> data;
- recv_data >> guid2; //tag guid
+ recvData >> guid1; //pet guid
+ recvData >> data;
+ recvData >> guid2; //tag guid
uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data);
uint8 flag = UNIT_ACTION_BUTTON_TYPE(data); //delete = 0x07 CastSpell = C1
@@ -110,10 +110,10 @@ void WorldSession::HandlePetAction(WorldPacket & recv_data)
}
}
-void WorldSession::HandlePetStopAttack(WorldPacket &recv_data)
+void WorldSession::HandlePetStopAttack(WorldPacket &recvData)
{
uint64 guid;
- recv_data >> guid;
+ recvData >> guid;
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PET_STOP_ATTACK for GUID " UI64FMTD "", guid);
@@ -402,15 +402,15 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid
}
}
-void WorldSession::HandlePetNameQuery(WorldPacket & recv_data)
+void WorldSession::HandlePetNameQuery(WorldPacket & recvData)
{
sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetNameQuery. CMSG_PET_NAME_QUERY");
uint32 petnumber;
uint64 petguid;
- recv_data >> petnumber;
- recv_data >> petguid;
+ recvData >> petnumber;
+ recvData >> petguid;
SendPetNameQuery(petguid, petnumber);
}
@@ -469,14 +469,14 @@ bool WorldSession::CheckStableMaster(uint64 guid)
return true;
}
-void WorldSession::HandlePetSetAction(WorldPacket & recv_data)
+void WorldSession::HandlePetSetAction(WorldPacket & recvData)
{
sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetSetAction. CMSG_PET_SET_ACTION");
uint64 petguid;
uint8 count;
- recv_data >> petguid;
+ recvData >> petguid;
Unit* pet = ObjectAccessor::GetUnit(*_player, petguid);
@@ -493,7 +493,7 @@ void WorldSession::HandlePetSetAction(WorldPacket & recv_data)
return;
}
- count = (recv_data.size() == 24) ? 2 : 1;
+ count = (recvData.size() == 24) ? 2 : 1;
uint32 position[2];
uint32 data[2];
@@ -501,8 +501,8 @@ void WorldSession::HandlePetSetAction(WorldPacket & recv_data)
for (uint8 i = 0; i < count; ++i)
{
- recv_data >> position[i];
- recv_data >> data[i];
+ recvData >> position[i];
+ recvData >> data[i];
uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data[i]);
@@ -586,7 +586,7 @@ void WorldSession::HandlePetSetAction(WorldPacket & recv_data)
}
}
-void WorldSession::HandlePetRename(WorldPacket & recv_data)
+void WorldSession::HandlePetRename(WorldPacket & recvData)
{
sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetRename. CMSG_PET_RENAME");
@@ -596,9 +596,9 @@ void WorldSession::HandlePetRename(WorldPacket & recv_data)
std::string name;
DeclinedName declinedname;
- recv_data >> petguid;
- recv_data >> name;
- recv_data >> isdeclined;
+ recvData >> petguid;
+ recvData >> name;
+ recvData >> isdeclined;
Pet* pet = ObjectAccessor::FindPet(petguid);
// check it!
@@ -632,7 +632,7 @@ void WorldSession::HandlePetRename(WorldPacket & recv_data)
{
for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
{
- recv_data >> declinedname.name[i];
+ recvData >> declinedname.name[i];
}
std::wstring wname;
@@ -671,10 +671,10 @@ void WorldSession::HandlePetRename(WorldPacket & recv_data)
pet->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, uint32(time(NULL))); // cast can't be helped
}
-void WorldSession::HandlePetAbandon(WorldPacket & recv_data)
+void WorldSession::HandlePetAbandon(WorldPacket & recvData)
{
uint64 guid;
- recv_data >> guid; //pet guid
+ recvData >> guid; //pet guid
sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid));
if (!_player->IsInWorld())
@@ -855,33 +855,33 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
SendPacket(&data);
}
-void WorldSession::HandlePetLearnTalent(WorldPacket & recv_data)
+void WorldSession::HandlePetLearnTalent(WorldPacket & recvData)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_PET_LEARN_TALENT");
uint64 guid;
uint32 talent_id, requested_rank;
- recv_data >> guid >> talent_id >> requested_rank;
+ recvData >> guid >> talent_id >> requested_rank;
_player->LearnPetTalent(guid, talent_id, requested_rank);
_player->SendTalentsInfoData(true);
}
-void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket & recv_data)
+void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket & recvData)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS_PET");
uint64 guid;
- recv_data >> guid;
+ recvData >> guid;
uint32 talentsCount;
- recv_data >> talentsCount;
+ recvData >> talentsCount;
uint32 talentId, talentRank;
for (uint32 i = 0; i < talentsCount; ++i)
{
- recv_data >> talentId >> talentRank;
+ recvData >> talentId >> talentRank;
_player->LearnPetTalent(guid, talentId, talentRank);
}