diff options
| author | Machiavelli <none@none> | 2009-10-11 19:35:54 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-10-11 19:35:54 +0200 |
| commit | 7e491b0fdd2b89b587297e8c53a4a55931443e9e (patch) | |
| tree | e08e8d1dc316b8f1800b742c30a8e90cd0d4fb17 /src/game/ReputationMgr.cpp | |
| parent | e113939587a42e8eda8a500114531f014cd42a70 (diff) | |
Never show standing with factions of the opposing team.
Minor cleanup in affected code.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ReputationMgr.cpp')
| -rw-r--r-- | src/game/ReputationMgr.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp index ec661c37b7b..006f47980ac 100644 --- a/src/game/ReputationMgr.cpp +++ b/src/game/ReputationMgr.cpp @@ -357,7 +357,9 @@ void ReputationMgr::SetVisible(FactionTemplateEntry const*factionTemplateEntry) return; if(FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionTemplateEntry->faction)) - SetVisible(factionEntry); + // Never show factions of the opposing team + if(!(factionEntry->BaseRepRaceMask[1] & m_player->getRaceMask() && factionEntry->BaseRepValue[1] == Reputation_Bottom) ) + SetVisible(factionEntry); } void ReputationMgr::SetVisible(FactionEntry const *factionEntry) @@ -376,10 +378,7 @@ void ReputationMgr::SetVisible(FactionState* faction) { // always invisible or hidden faction can't be make visible // except if faction has FACTION_FLAG_SPECIAL - if(faction->Flags & FACTION_FLAG_INVISIBLE_FORCED && !(faction->Flags & FACTION_FLAG_SPECIAL) ) - return; - - if(faction->Flags & FACTION_FLAG_HIDDEN) + if(faction->Flags & (FACTION_FLAG_INVISIBLE_FORCED|FACTION_FLAG_HIDDEN) && !(faction->Flags & FACTION_FLAG_SPECIAL) ) return; // already set |