aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authortibbi <tibbi@centrum.sk>2012-10-08 17:21:09 +0100
committertibbi <tibbi@centrum.sk>2012-10-08 17:21:09 +0100
commit5896da6689410f1c06ee86f8b093fb2d370eb84f (patch)
tree495f30c78128f4112f68a1072d4fb2af56acde51 /src/server/game/Globals/ObjectMgr.cpp
parentd49c2a5e4d66b1f4bd4bdff3d6ed92902e8565f8 (diff)
some optimization + adding level to CharacterNameData
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rwxr-xr-xsrc/server/game/Globals/ObjectMgr.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index ea4386c4d41..b28f8be7805 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -7591,7 +7591,7 @@ SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id)
}
// this allows calculating base reputations to offline players, just by race and class
-int32 ObjectMgr::GetBaseReputation(FactionEntry const* factionEntry, uint8 race, uint32 playerClass)
+int32 ObjectMgr::GetBaseReputation(FactionEntry const* factionEntry, uint8 race, uint8 playerClass)
{
if (!factionEntry)
return 0;
@@ -7599,13 +7599,12 @@ int32 ObjectMgr::GetBaseReputation(FactionEntry const* factionEntry, uint8 race,
uint32 raceMask = (1 << (race - 1));
uint32 classMask = (1 << (playerClass-1));
- for (int i=0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
- if ((factionEntry->BaseRepRaceMask[i] & raceMask ||
- (factionEntry->BaseRepRaceMask[i] == 0 &&
- factionEntry->BaseRepClassMask[i] != 0)) &&
- (factionEntry->BaseRepClassMask[i] & classMask ||
- factionEntry->BaseRepClassMask[i] == 0))
+ if ((!factionEntry->BaseRepClassMask[i] ||
+ factionEntry->BaseRepClassMask[i] & classMask) &&
+ (!factionEntry->BaseRepRaceMask[i] ||
+ factionEntry->BaseRepRaceMask[i] & raceMask))
return factionEntry->BaseRepValue[i];
}