1 files changed, 58 insertions, 12 deletions

diff --git a/src/gui/trade.h b/src/gui/trade.h
index c51e0fdd..bde0481c 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -1,26 +1,28 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRADE_H
-#define _TMW_TRADE_H
+#ifndef TRADE_H
+#define TRADE_H
+
+#include <memory>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
@@ -32,6 +34,9 @@
 class Inventory;
 class Item;
 class ItemContainer;
+#ifdef EATHENA_SUPPORT
+class Network;
+#endif
 class ScrollArea;
 
 /**
@@ -45,7 +50,11 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
         TradeWindow();
+#else
+        TradeWindow(Network *network);
+#endif
 
         /**
          * Destructor.
@@ -67,16 +76,41 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void reset();
 
+#ifdef EATHENA_SUPPORT
+        /**
+         * Add an item to the trade window.
+         */
+        void addItem(int id, bool own, int quantity, bool equipment);
+
+        /**
+         * Change quantity of an item.
+         */
+        void changeQuantity(int index, bool own, int quantity);
+
+        /**
+         * Increase quantity of an item.
+         */
+        void increaseQuantity(int index, bool own, int quantity);
+
+        /**
+         * Set trade Button disabled
+         */
+        void setTradeButton(bool enabled);
+#endif
+
         /**
          * Player received ok message from server
          */
+#ifdef TMWSERV_SUPPORT
         void receivedOk();
+#else
+        void receivedOk(bool own);
+#endif
 
         /**
          * Send trade packet.
          */
-        void
-        tradeItem(Item *item, int quantity);
+        void tradeItem(Item *item, int quantity);
 
         /**
          * Updates the labels and makes sure only one item is selected in
@@ -90,6 +124,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         void action(const gcn::ActionEvent &event);
 
     private:
+#ifdef TMWSERV_SUPPORT
         enum Status
         {
             PREPARING, /**< Players are adding items. */
@@ -101,20 +136,31 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          * Sets the current status of the trade.
          */
         void setStatus(Status);
+#endif
+
+#ifdef EATHENA_SUPPORT
+        Network *mNetwork;
+#endif
 
-        Inventory *mMyInventory;
-        Inventory *mPartnerInventory;
+        typedef const std::auto_ptr<Inventory> InventoryPtr;
+        InventoryPtr mMyInventory;
+        InventoryPtr mPartnerInventory;
 
         ItemContainer *mMyItemContainer;
         ItemContainer *mPartnerItemContainer;
 
-        gcn::Label *mItemNameLabel;
-        gcn::Label *mItemDescriptionLabel;
         gcn::Label *mMoneyLabel;
         gcn::Button *mTradeButton;
+#ifdef EATHENA_SUPPORT
+        gcn::Button *mOkButton;
+#endif
         gcn::TextField *mMoneyField;
 
+#ifdef TMWSERV_SUPPORT
         Status mStatus;
+#else
+        bool mOkOther, mOkMe;
+#endif
 };
 
 extern TradeWindow *tradeWindow;