diff options
| author | MitchesD <majklprofik@seznam.cz> | 2016-04-07 16:16:26 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2016-04-07 16:16:26 +0200 |
| commit | 8b1428cca634f9ad5e8a1e05479750dfd62f0304 (patch) | |
| tree | 12de3800340fca4a30e62edaf3fc607cf1f00c43 /src | |
| parent | 08c27d3205a6dc825512757ab88acf0e4379fe75 (diff) | |
Core/BattlePets: updated enums to 6.2.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/BattlePets/BattlePetMgr.h | 17 | ||||
| -rw-r--r-- | src/server/game/Handlers/BattlePetHandler.cpp | 4 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/server/game/BattlePets/BattlePetMgr.h b/src/server/game/BattlePets/BattlePetMgr.h index 0cfdb38a31f..7fed49ce5e9 100644 --- a/src/server/game/BattlePets/BattlePetMgr.h +++ b/src/server/game/BattlePets/BattlePetMgr.h @@ -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, diff --git a/src/server/game/Handlers/BattlePetHandler.cpp b/src/server/game/Handlers/BattlePetHandler.cpp index c46206608e2..1b31c1d2792 100644 --- a/src/server/game/Handlers/BattlePetHandler.cpp +++ b/src/server/game/Handlers/BattlePetHandler.cpp @@ -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) |