aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-11 16:18:54 -0600
committermegamage <none@none>2009-03-11 16:18:54 -0600
commit6e12d3f1b9f40f3f95390245f3fcbb30fbd8657f (patch)
tree69fab1ffbb4cb38dcff13dfde8b5efb064dfd84a /src
parent6e29ab4fbbb6b0fb0270d73120871ff5336d784f (diff)
[7441] Fixed reward money counting for ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index ae4b4466a96..3123bfab829 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -13169,7 +13169,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
GiveXP( XP , NULL );
else
{
- int32 money = int32(pQuest->GetRewMoneyMaxLevel() * sWorld.getRate(RATE_DROP_MONEY));
+ uint32 money = uint32(pQuest->GetRewMoneyMaxLevel() * sWorld.getRate(RATE_DROP_MONEY));
ModifyMoney( money );
GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, money);
}
@@ -13178,7 +13178,9 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
if(pQuest->GetRewOrReqMoney())
{
ModifyMoney( pQuest->GetRewOrReqMoney() );
- GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, pQuest->GetRewOrReqMoney());
+
+ if(pQuest->GetRewOrReqMoney() > 0)
+ GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, pQuest->GetRewOrReqMoney());
}
// honor reward