Trade system

Handler & GUI modification, to make the three steps systems working.
Protocol changes for the same reason
Player.cpp changes because it uses the cancel method which signature has changed

1 files changed, 5 insertions, 3 deletions

diff --git a/src/gui/trade.h b/src/gui/trade.h
index 2260dcc1..3c292496 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -114,9 +114,10 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
     private:
         enum Status
         {
-            PREPARING, /**< Players are adding items. */
-            PROPOSING, /**< Local player is proposing a trade. */
-            ACCEPTING  /**< Distant player is proposing a trade. */
+            PREPARING, /**< Players are adding items. (1) */
+            PROPOSING, /**< Local player has confirmed the trade. (1) */
+            ACCEPTING, /**< Accepting the trade. (2) */
+            ACCEPTED  /**< Local player has accepted the trade. */
         };
 
         /**
@@ -134,6 +135,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         gcn::Label *mMoneyLabel;
         gcn::Button *mAddButton;
         gcn::Button *mOkButton;
+        gcn::Button  *mMoneyChangeButton;
         gcn::TextField *mMoneyField;
 
         Status mStatus;