teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #926 from bentsherman/master

Browse source 
Allow +/- buttons in trade window to decrease offer to 0
This commit is contained in:
scrawl 2016-04-10 00:05:29 +02:00
commit b2dc18e1aa
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwgui/tradewindow.cpp
View file

@ -476,15 +476,15 @@ 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 == INT_MAX || mCurrentBalance == INT_MIN+1) if (mCurrentBalance == INT_MAX || mCurrentBalance == INT_MIN+1)
return; return;
if(mCurrentBalance<=-1) mCurrentBalance -= 1; if (mCurrentBalance < 0) mCurrentBalance -= 1;
if(mCurrentBalance>=1) mCurrentBalance += 1; else mCurrentBalance += 1;
updateLabels(); updateLabels();
} }
void TradeWindow::onDecreaseButtonTriggered() void TradeWindow::onDecreaseButtonTriggered()
{ {
if(mCurrentBalance<-1) mCurrentBalance += 1; if (mCurrentBalance < 0) mCurrentBalance += 1;
if(mCurrentBalance>1) mCurrentBalance -= 1; else mCurrentBalance -= 1;
updateLabels(); updateLabels();
} }
@ -495,13 +495,13 @@ namespace MWGui
mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold)); mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold));
if (mCurrentBalance > 0) if (mCurrentBalance < 0)
{ {
mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}"); mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
} }
else else
{ {
mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}"); mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}");
} }
mTotalBalance->setValue(std::abs(mCurrentBalance)); mTotalBalance->setValue(std::abs(mCurrentBalance));