diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-28 14:11:04 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-28 14:11:04 +0100 |
| commit | 9bb198d17037a9b41be09d137bb6237f9acd62c5 (patch) | |
| tree | 4202a0472a6ef8ccd19613b0f4b8c1ab0ddb1e2b /src/server/game/Quests/QuestDef.cpp | |
| parent | e4aacd3f86f2e2d44d062c9df3f2f2775fa9ca62 (diff) | |
| parent | ec527fa172f64f47406d9317b8c3a98e9c46f812 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/authserver/Authentication/AuthCodes.cpp
src/server/authserver/Authentication/AuthCodes.h
src/server/authserver/Server/AuthSocket.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/game/Quests/QuestDef.cpp')
| -rwxr-xr-x | src/server/game/Quests/QuestDef.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 2a16756161b..6aa9500b998 100755 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -347,10 +347,11 @@ uint32 Quest::CalculateHonorGain(uint8 level) const /*if (GetRewHonorAddition() > 0 || GetRewHonorMultiplier() > 0.0f) { // values stored from 0.. for 1... - TeamContributionPointsEntry const* tc = sTeamContributionPointsStore.LookupEntry(level-1); + TeamContributionPointsEntry const* tc = sTeamContributionPointsStore.LookupEntry(level); if (!tc) return 0; - honor = uint32(tc->value * GetRewHonorMultiplier() * 0.1000000014901161); + + honor = uint32(tc->value * GetRewHonorMultiplier() * 0.1f); honor += GetRewHonorAddition(); }*/ |