diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
| commit | 3cc50e69f1ece93e8542fb43575453ae4bcc5e61 (patch) | |
| tree | e771165c1f4dd9c82407207634cb6023f3dd9520 /src/server/game/Reputation/ReputationMgr.cpp | |
| parent | 642dd62cc7b8bfc4d4d04d2d06462737d73fcfe6 (diff) | |
Core/Players: Fixed racemasks usage for new races
Diffstat (limited to 'src/server/game/Reputation/ReputationMgr.cpp')
| -rw-r--r-- | src/server/game/Reputation/ReputationMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index aa5738f56a9..1c362984ecc 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -92,12 +92,12 @@ int32 ReputationMgr::GetBaseReputation(FactionEntry const* factionEntry) const if (!factionEntry) return 0; - uint64 raceMask = _player->getRaceMask(); + uint8 race = _player->getRace(); uint32 classMask = _player->getClassMask(); for (int i=0; i < 4; i++) { - if ((factionEntry->ReputationRaceMask[i] & raceMask || - (factionEntry->ReputationRaceMask[i] == 0 && + if ((factionEntry->ReputationRaceMask[i].HasRace(race) || + (!factionEntry->ReputationRaceMask[i] && factionEntry->ReputationClassMask[i] != 0)) && (factionEntry->ReputationClassMask[i] & classMask || factionEntry->ReputationClassMask[i] == 0)) @@ -151,12 +151,12 @@ uint32 ReputationMgr::GetDefaultStateFlags(FactionEntry const* factionEntry) con if (!factionEntry) return 0; - uint64 raceMask = _player->getRaceMask(); + uint8 race = _player->getRace(); uint32 classMask = _player->getClassMask(); for (int i=0; i < 4; i++) { - if ((factionEntry->ReputationRaceMask[i] & raceMask || - (factionEntry->ReputationRaceMask[i] == 0 && + if ((factionEntry->ReputationRaceMask[i].HasRace(race) || + (!factionEntry->ReputationRaceMask[i] && factionEntry->ReputationClassMask[i] != 0)) && (factionEntry->ReputationClassMask[i] & classMask || factionEntry->ReputationClassMask[i] == 0)) @@ -396,7 +396,7 @@ void ReputationMgr::SetVisible(FactionTemplateEntry const* factionTemplateEntry) if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionTemplateEntry->Faction)) // Never show factions of the opposing team - if (!(factionEntry->ReputationRaceMask[1] & _player->getRaceMask() && factionEntry->ReputationBase[1] == Reputation_Bottom)) + if (!(factionEntry->ReputationRaceMask[1].HasRace(_player->getRace()) && factionEntry->ReputationBase[1] == Reputation_Bottom)) SetVisible(factionEntry); } |