diff options
-rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_learn.cpp | 2 | ||||
-rw-r--r-- | src/server/shared/DataStores/DBCStructure.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 82ca652d390..0909e7e04f9 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1630,7 +1630,7 @@ bool Pet::resetTalents() continue; // unlearn only talents for pets family talent type - if (!((1 << pet_family->PetTalentType) & talentTabInfo->CategoryEnumID)) + if (!((1 << pet_family->PetTalentType) & talentTabInfo->PetTalentMask)) continue; for (uint8 j = 0; j < MAX_TALENT_RANK; ++j) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 123f9886cb3..3ccd5a4bba7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25360,7 +25360,7 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa return; // prevent learn talent for different family (cheating) - if (!((1 << pet_family->PetTalentType) & talentTabInfo->CategoryEnumID)) + if (!((1 << pet_family->PetTalentType) & talentTabInfo->PetTalentMask)) return; // find current max talent rank (0~5) @@ -25624,7 +25624,7 @@ void Player::BuildPetTalentsInfoData(WorldPacket* data) if (!talentTabInfo) continue; - if (!((1 << pet_family->PetTalentType) & talentTabInfo->CategoryEnumID)) + if (!((1 << pet_family->PetTalentType) & talentTabInfo->PetTalentMask)) continue; for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId) diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 77c2c4841d9..ff081b71ab7 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -283,7 +283,7 @@ public: continue; // prevent learn talent for different family (cheating) - if (((1 << petFamily->PetTalentType) & talentTabInfo->CategoryEnumID) == 0) + if (((1 << petFamily->PetTalentType) & talentTabInfo->PetTalentMask) == 0) continue; // search highest talent rank diff --git a/src/server/shared/DataStores/DBCStructure.h b/src/server/shared/DataStores/DBCStructure.h index 6377f6a4ad6..e6deee31630 100644 --- a/src/server/shared/DataStores/DBCStructure.h +++ b/src/server/shared/DataStores/DBCStructure.h @@ -1682,7 +1682,7 @@ struct TalentTabEntry //unit32 SpellIconID; // 18 //uint32 RaceMask; // 19 uint32 ClassMask; // 20 - uint32 CategoryEnumID; // 21 + uint32 PetTalentMask; // 21 uint32 OrderIndex; // 22 //char* BackgroundFile; // 23 }; |