diff options
author | jackpoz <giacomopoz@gmail.com> | 2015-10-04 14:20:00 +0200 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2015-10-04 14:20:00 +0200 |
commit | aee4c296702ad240cde464b3658cf299a0fd1af3 (patch) | |
tree | ccf3f3a95a4fa05c4a290082ee5f325956839859 /src | |
parent | 774ea0b4bd1e0d469cfce8013f2e557f030c7c97 (diff) | |
parent | 817a2ce4f744d75e8526e351b35ed1c787cc5b01 (diff) |
Merge pull request #15533 from Tomatodev/3.3.5
Core/AuctionHouse: fix config value RATE_AUCTION_DEPOSIT < 1 ignored by deposit formula
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 96a4fd42f5e..1809e306a45 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -79,7 +79,7 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 uint32 MSV = pItem->GetTemplate()->SellPrice; if (MSV <= 0) - return AH_MINIMUM_DEPOSIT; + return AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT); float multiplier = CalculatePct(float(entry->depositPercent), 3); uint32 timeHr = (((time / 60) / 60) / 12); @@ -90,8 +90,8 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 TC_LOG_DEBUG("auctionHouse", "Multiplier: %f", multiplier); TC_LOG_DEBUG("auctionHouse", "Deposit: %u", deposit); - if (deposit < AH_MINIMUM_DEPOSIT) - return AH_MINIMUM_DEPOSIT; + if (deposit < AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT)) + return AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT); else return deposit; } |