summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-22 13:59:03 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-22 13:59:34 -0600
commit5daf061f697f5e67578d7ebd228e2aa47d20d3fd (patch)
tree1b858c08fc14a8a2be0a2e1f0213d449407be7af /src
parent75b254e707d9a9a650247b8b324354b6fb5df388 (diff)
downloadmana-5daf061f697f5e67578d7ebd228e2aa47d20d3fd.tar.gz
mana-5daf061f697f5e67578d7ebd228e2aa47d20d3fd.tar.bz2
mana-5daf061f697f5e67578d7ebd228e2aa47d20d3fd.tar.xz
mana-5daf061f697f5e67578d7ebd228e2aa47d20d3fd.zip
FIx trading under eAthena
Diffstat (limited to 'src')
-rw-r--r--src/gui/trade.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 1368e43e..95e5dc47 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -132,13 +132,11 @@ void TradeWindow::setMoney(int amount)
mMoneyLabel->setCaption(strprintf(_("You get %s."),
Units::formatCurrency(amount).c_str()));
mMoneyLabel->adjustSize();
- //setStatus(PREPARING);
}
void TradeWindow::addItem(int id, bool own, int quantity)
{
(own ? mMyInventory : mPartnerInventory)->addItem(id, quantity);
- //setStatus(PREPARING);
}
void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
@@ -175,7 +173,7 @@ void TradeWindow::reset()
mPartnerInventory->clear();
mOkOther = false;
mOkMe = false;
- mMoneyLabel->setCaption(strprintf(_("You get %s."), "0GP"));
+ setMoney(0);
mMoneyField->setEnabled(true);
mMoneyField->setText("");
mAddButton->setEnabled(true);
@@ -192,8 +190,8 @@ void TradeWindow::receivedOk(bool own)
if (mOkMe && mOkOther)
{
- mOkMe = false;
- mOkOther = false;
+ //mOkMe = false;
+ //mOkOther = false;
setStatus(ACCEPTING);
}
}