diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 20:49:17 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-15 20:49:17 -0600 |
commit | 6b59adabfcf909cb02075e2fab2d715b4e34af95 (patch) | |
tree | 3ef8c4a547ad8849395055d5ac61dc2bd81a9928 /src/gui/trade.h | |
parent | 24fb77131bf6a56c0a9db296c21e4182e303c0cb (diff) | |
download | mana-client-6b59adabfcf909cb02075e2fab2d715b4e34af95.tar.gz mana-client-6b59adabfcf909cb02075e2fab2d715b4e34af95.tar.bz2 mana-client-6b59adabfcf909cb02075e2fab2d715b4e34af95.tar.xz mana-client-6b59adabfcf909cb02075e2fab2d715b4e34af95.zip |
Merge the trade dialog
Diffstat (limited to 'src/gui/trade.h')
-rw-r--r-- | src/gui/trade.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/gui/trade.h b/src/gui/trade.h index 3493c4c6..2260dcc1 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -69,7 +69,6 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener */ void reset(); -#ifdef EATHENA_SUPPORT /** * Add an item to the trade window. */ @@ -84,16 +83,11 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener * Increase quantity of an item. */ void increaseQuantity(int index, bool own, int quantity); -#endif /** * Player received ok message from server */ -#ifdef TMWSERV_SUPPORT - void receivedOk(); -#else void receivedOk(bool own); -#endif /** * Send trade packet. @@ -128,7 +122,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener /** * Sets the current status of the trade. */ - void setStatus(Status); + void setStatus(Status s); typedef const std::auto_ptr<Inventory> InventoryPtr; InventoryPtr mMyInventory; @@ -138,17 +132,12 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener ItemContainer *mPartnerItemContainer; gcn::Label *mMoneyLabel; - gcn::Button *mTradeButton; -#ifdef EATHENA_SUPPORT gcn::Button *mAddButton; gcn::Button *mOkButton; -#endif gcn::TextField *mMoneyField; Status mStatus; -#ifdef EATHENA_SUPPORT bool mOkOther, mOkMe; -#endif }; extern TradeWindow *tradeWindow; |