From 6e12d3f1b9f40f3f95390245f3fcbb30fbd8657f Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 11 Mar 2009 16:18:54 -0600
Subject: [7441] Fixed reward money counting for
 ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD Author: VladimirMangos

--HG--
branch : trunk
---
 src/game/Player.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3