Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 23:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/BattlePets: updated enums to 6.2.4

Browse Source
This commit is contained in:
MitchesD
2016-04-07 16:16:26 +02:00
parent 08c27d3205
commit 8b1428cca6
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/game/BattlePets/BattlePetMgr.h
View File

@@ -29,14 +29,21 @@ enum BattlePetMisc
DEFAULT_SUMMON_BATTLE_PET_SPELL = 118301
};
// TODO: fix undefined values in this enum
// 6.2.4
enum FlagsControlType
{
FLAGS_CONTROL_TYPE_APPLY = 1,
FLAGS_CONTROL_TYPE_REMOVE = 2
};
// 6.2.4
enum BattlePetError
{
BATTLEPETRESULT_CANT_HAVE_MORE_PETS_OF_THAT_TYPE = 9,
BATTLEPETRESULT_TOO_HIGH_LEVEL_TO_UNCAGE = 12,
BATTLEPETRESULT_CANT_HAVE_MORE_PETS = 13,
BATTLEPETRESULT_CANT_HAVE_MORE_PETS_OF_THAT_TYPE = 3,
BATTLEPETRESULT_CANT_HAVE_MORE_PETS = 4,
BATTLEPETRESULT_TOO_HIGH_LEVEL_TO_UNCAGE = 7,
// wrong order
// TODO: find correct values if possible and needed (also wrong order)
BATTLEPETRESULT_DUPLICATE_CONVERTED_PET,
BATTLEPETRESULT_NEED_TO_UNLOCK,
BATTLEPETRESULT_BAD_PARAM,

4
src/server/game/Handlers/BattlePetHandler.cpp
View File

@@ -59,9 +59,9 @@ void WorldSession::HandleBattlePetSetFlags(WorldPackets::BattlePet::BattlePetSet
{
if (BattlePetMgr::BattlePet* pet = GetBattlePetMgr()->GetPet(battlePetSetFlags.PetGuid))
{
if (battlePetSetFlags.ControlType == 2) // 2 - apply
if (battlePetSetFlags.ControlType == FLAGS_CONTROL_TYPE_APPLY)
pet->PacketInfo.Flags |= battlePetSetFlags.Flags;
else // 3 - remove
else // FLAGS_CONTROL_TYPE_REMOVE
pet->PacketInfo.Flags &= ~battlePetSetFlags.Flags;
if (pet->SaveInfo != BATTLE_PET_NEW)