Merge pull request #15533 from Tomatodev/3.3.5

Core/AuctionHouse: fix config value RATE_AUCTION_DEPOSIT < 1 ignored by deposit formula
This commit is contained in:
jackpoz committed 2015-10-04 14:20:00 +02:00
commit aee4c29670
1 file changed
+3 -3
@@ -79,7 +79,7 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32
uint32 MSV = pItem->GetTemplate()->SellPrice; uint32 MSV = pItem->GetTemplate()->SellPrice;
if (MSV <= 0) if (MSV <= 0)
return AH_MINIMUM_DEPOSIT; return AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT);
float multiplier = CalculatePct(float(entry->depositPercent), 3); float multiplier = CalculatePct(float(entry->depositPercent), 3);
uint32 timeHr = (((time / 60) / 60) / 12); 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", "Multiplier: %f", multiplier);
TC_LOG_DEBUG("auctionHouse", "Deposit: %u", deposit); TC_LOG_DEBUG("auctionHouse", "Deposit: %u", deposit);
if (deposit < AH_MINIMUM_DEPOSIT) if (deposit < AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT))
return AH_MINIMUM_DEPOSIT; return AH_MINIMUM_DEPOSIT * sWorld->getRate(RATE_AUCTION_DEPOSIT);
else else
return deposit; return deposit;
} }