aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Handlers/PetHandler.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index eb2510b28df..e312422087b 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -64,11 +64,11 @@ void WorldSession::HandleRequestPetInfo(WorldPackets::Pet::RequestPetInfo& /*pac
void WorldSession::HandlePetAction(WorldPackets::Pet::PetAction& packet)
{
- ObjectGuid guid1 = packet.PetGUID; //pet guid
- ObjectGuid guid2 = packet.TargetGUID; //tag guid
+ ObjectGuid guid1 = packet.PetGUID; //pet guid
+ ObjectGuid guid2 = packet.TargetGUID; //tag guid
uint32 spellid = UNIT_ACTION_BUTTON_ACTION(packet.Action);
- uint8 flag = UNIT_ACTION_BUTTON_TYPE(packet.Action); //delete = 0x07 CastSpell = C1
+ uint8 flag = UNIT_ACTION_BUTTON_TYPE(packet.Action); //delete = 0x07 CastSpell = C1
// used also for charmed creature
Unit* pet = ObjectAccessor::GetUnit(*_player, guid1);
@@ -103,7 +103,7 @@ void WorldSession::HandlePetAction(WorldPackets::Pet::PetAction& packet)
HandlePetActionHelper(pet, guid1, spellid, flag, guid2, packet.ActionPosition);
else
{
- //If a pet is dismissed, m_Controlled will change
+ // If a pet is dismissed, m_Controlled will change
std::vector<Unit*> controlled;
for (Unit::ControlList::iterator itr = GetPlayer()->m_Controlled.begin(); itr != GetPlayer()->m_Controlled.end(); ++itr)
if ((*itr)->GetEntry() == pet->GetEntry() && (*itr)->IsAlive())
@@ -148,15 +148,15 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
switch (flag)
{
- case ACT_COMMAND: //0x07
+ case ACT_COMMAND: // 0x07
switch (spellid)
{
- case COMMAND_STAY: //flat=1792 //STAY
+ case COMMAND_STAY: // flat = 1792 - STAY
pet->StopMoving();
pet->GetMotionMaster()->Clear();
pet->GetMotionMaster()->MoveIdle();
- charmInfo->SetCommandState(COMMAND_STAY);
+ charmInfo->SetCommandState(COMMAND_STAY);
charmInfo->SetIsCommandAttack(false);
charmInfo->SetIsAtStay(true);
charmInfo->SetIsCommandFollow(false);
@@ -164,24 +164,24 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
charmInfo->SetIsReturning(false);
charmInfo->SaveStayPosition();
break;
- case COMMAND_FOLLOW: //spellid=1792 //FOLLOW
+ case COMMAND_FOLLOW: // spellid = 1792 - FOLLOW
pet->AttackStop();
pet->InterruptNonMeleeSpells(false);
pet->GetMotionMaster()->MoveFollow(_player, PET_FOLLOW_DIST, pet->GetFollowAngle());
- charmInfo->SetCommandState(COMMAND_FOLLOW);
+ charmInfo->SetCommandState(COMMAND_FOLLOW);
charmInfo->SetIsCommandAttack(false);
charmInfo->SetIsAtStay(false);
charmInfo->SetIsReturning(true);
charmInfo->SetIsCommandFollow(true);
charmInfo->SetIsFollowing(false);
break;
- case COMMAND_ATTACK: //spellid=1792 //ATTACK
+ case COMMAND_ATTACK: // spellid = 1792 - ATTACK
{
// Can't attack if owner is pacified
if (_player->HasAuraType(SPELL_AURA_MOD_PACIFY))
{
- //pet->SendPetCastFail(spellid, SPELL_FAILED_PACIFIED);
+ // pet->SendPetCastFail(spellid, SPELL_FAILED_PACIFIED);
/// @todo Send proper error message to client
return;
}
@@ -215,7 +215,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
else
AI->AttackStart(TargetUnit);
- //10% chance to play special pet attack talk, else growl
+ // 10% chance to play special pet attack talk, else growl
if (pet->IsPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10)
pet->SendPetTalk((uint32)PET_TALK_ATTACK);
else
@@ -224,7 +224,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
pet->SendPetAIReaction(guid1);
}
}
- else // charmed player
+ else // charmed player
{
charmInfo->SetIsCommandAttack(true);
charmInfo->SetIsAtStay(false);
@@ -238,7 +238,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
}
break;
}
- case COMMAND_ABANDON: // abandon (hunter pet) or dismiss (summoned pet)
+ case COMMAND_ABANDON: // abandon (hunter pet) or dismiss (summoned pet)
if (pet->GetCharmerGUID() == GetPlayer()->GetGUID())
_player->StopCastingCharm();
else if (pet->GetOwnerGUID() == GetPlayer()->GetGUID())
@@ -249,7 +249,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
if (((Pet*)pet)->getPetType() == HUNTER_PET)
GetPlayer()->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED);
else
- //dismissing a summoned pet is like killing them (this prevents returning a soulshard...)
+ // dismissing a summoned pet is like killing them (this prevents returning a soulshard...)
pet->setDeathState(CORPSE);
}
else if (pet->HasUnitTypeMask(UNIT_MASK_MINION))
@@ -274,22 +274,22 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
TC_LOG_ERROR("entities.pet", "WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
}
break;
- case ACT_REACTION: // 0x6
+ case ACT_REACTION: // 0x6
switch (spellid)
{
- case REACT_PASSIVE: //passive
+ case REACT_PASSIVE: // passive
pet->AttackStop();
/* fallthrough */
- case REACT_DEFENSIVE: //recovery
- case REACT_AGGRESSIVE: //activete
+ case REACT_DEFENSIVE: // recovery
+ case REACT_AGGRESSIVE: // activete
if (pet->GetTypeId() == TYPEID_UNIT)
pet->ToCreature()->SetReactState(ReactStates(spellid));
break;
}
break;
- case ACT_DISABLED: // 0x81 spell (disabled), ignore
- case ACT_PASSIVE: // 0x01
- case ACT_ENABLED: // 0xC1 spell
+ case ACT_DISABLED: // 0x81 spell (disabled), ignore
+ case ACT_PASSIVE: // 0x01
+ case ACT_ENABLED: // 0xC1 spell
{
Unit* unit_target = nullptr;
@@ -314,8 +314,8 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
if (!pet->HasSpell(spellid) || spellInfo->IsPassive())
return;
- // Clear the flags as if owner clicked 'attack'. AI will reset them
- // after AttackStart, even if spell failed
+ // Clear the flags as if owner clicked 'attack'. AI will reset them
+ // after AttackStart, even if spell failed
if (pet->GetCharmInfo())
{
pet->GetCharmInfo()->SetIsAtStay(false);
@@ -328,7 +328,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
SpellCastResult result = spell->CheckPetCast(unit_target);
- //auto turn to target unless possessed
+ // auto turn to target unless possessed
if (result == SPELL_FAILED_UNIT_NOT_INFRONT && !pet->isPossessed() && !pet->IsVehicle())
{
if (unit_target)
@@ -357,8 +357,8 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
{
unit_target = spell->m_targets.GetUnitTarget();
- //10% chance to play special pet attack talk, else growl
- //actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
+ // 10% chance to play special pet attack talk, else growl
+ // actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
if (pet->IsPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10))
pet->SendPetTalk((uint32)PET_TALK_SPECIAL_SPELL);
else