mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-27 14:37:04 +00:00
Code Issues Projects Releases Wiki Activity

Update tradewindow.cpp

Browse Source
This commit is contained in:
Kindi 2021-10-04 20:44:56 +00:00
parent 0c1b78c42a
commit f28d6738bf
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwgui/tradewindow.cpp
View File

@ -52,7 +52,6 @@ namespace MWGui
, mItemToSell(-1) , mItemToSell(-1)
, mCurrentBalance(0) , mCurrentBalance(0)
, mCurrentMerchantOffer(0) , mCurrentMerchantOffer(0)
, mReceiveMoney(false)
{ {
getWidget(mFilterAll, "AllButton"); getWidget(mFilterAll, "AllButton");
getWidget(mFilterWeapon, "WeaponButton"); getWidget(mFilterWeapon, "WeaponButton");
@ -412,7 +411,7 @@ namespace MWGui
mCurrentBalance = (mCurrentBalance >= 0 ? 1 : -1) * value; mCurrentBalance = (mCurrentBalance >= 0 ? 1 : -1) * value;
updateLabels(); updateLabels();
if (mReceiveMoney && mCurrentBalance == 0) if (mCurrentBalance == 0)
mCurrentBalance = previousBalance; mCurrentBalance = previousBalance;
if (value != std::abs(value)) if (value != std::abs(value))
@ -424,6 +423,7 @@ namespace MWGui
// prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined // prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined
if (mCurrentBalance == std::numeric_limits<int>::max() || mCurrentBalance == std::numeric_limits<int>::min()+1) if (mCurrentBalance == std::numeric_limits<int>::max() || mCurrentBalance == std::numeric_limits<int>::min()+1)
return; return;
if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
if (mCurrentBalance < 0) mCurrentBalance -= 1; if (mCurrentBalance < 0) mCurrentBalance -= 1;
else mCurrentBalance += 1; else mCurrentBalance += 1;
updateLabels(); updateLabels();
@ -431,6 +431,7 @@ namespace MWGui
void TradeWindow::onDecreaseButtonTriggered() void TradeWindow::onDecreaseButtonTriggered()
{ {
if (mTotalBalance->getValue() == 0) mCurrentBalance = 0;
if (mCurrentBalance < 0) mCurrentBalance += 1; if (mCurrentBalance < 0) mCurrentBalance += 1;
else mCurrentBalance -= 1; else mCurrentBalance -= 1;
updateLabels(); updateLabels();
@ -450,16 +451,8 @@ namespace MWGui
{ {
mCurrentBalance = 0; mCurrentBalance = 0;
} }
else if (playerBorrowed.empty())
{
mReceiveMoney = false;
}
else if (merchantBorrowed.empty())
{
mReceiveMoney = true;
}
if (mCurrentBalance < 0 || mReceiveMoney) if (mCurrentBalance < 0)
{ {
mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}"); mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
} }