1 files changed, 54 insertions, 17 deletions

diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 9aee4bee..957ff861 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -1,47 +1,56 @@
 /*
  *  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
  */
 
-#include "sell.h"
-
-#include <cassert>
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
-#include "shoplistbox.h"
 #include "scrollarea.h"
+#include "sell.h"
 #include "shop.h"
+#include "shoplistbox.h"
 #include "slider.h"
 
 #include "widgets/layout.h"
 
-#include "../item.h"
 #include "../npc.h"
+#include "../units.h"
+
+#include "../net/messageout.h"
+#ifdef TMWSERV_SUPPORT
 #include "../net/gameserver/player.h"
-#include "../resources/iteminfo.h"
+#else
+#include "../net/ea/protocol.h"
+#endif
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
+#ifdef TMWSERV_SUPPORT
 SellDialog::SellDialog():
     Window(_("Sell")),
+#else
+SellDialog::SellDialog(Network *network):
+    Window(_("Sell")),
+    mNetwork(network),
+#endif
     mMaxItems(0), mAmountItems(0)
 {
     setWindowName("Sell");
@@ -50,13 +59,14 @@ SellDialog::SellDialog():
     setMinHeight(230);
     setDefaultSize(0, 0, 260, 230);
 
-    mShopItems = new ShopItems();
+    mShopItems = new ShopItems;
 
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
     mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
     mQuantityLabel = new gcn::Label("0");
-    mMoneyLabel = new gcn::Label(strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
+    mMoneyLabel = new gcn::Label(strprintf(_("Price: %s / Total: %s"),
+                                            "", ""));
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
     mSellButton = new Button(_("Sell"), "sell", this);
@@ -111,12 +121,30 @@ void SellDialog::reset()
     updateButtonsAndLabels();
 }
 
+#ifdef TMWSERV_SUPPORT
+
 void SellDialog::addItem(int item, int amount, int price)
 {
     mShopItems->addItem(item, amount, price);
     mShopItemList->adjustSize();
 }
 
+#else
+
+void SellDialog::addItem(const Item *item, int price)
+{
+    if (!item)
+        return;
+
+    mShopItems->addItem(
+            item->getInvIndex(), item->getId(),
+            item->getQuantity(), price);
+
+    mShopItemList->adjustSize();
+}
+
+#endif
+
 void SellDialog::action(const gcn::ActionEvent &event)
 {
     int selectedItem = mShopItemList->getSelected();
@@ -124,7 +152,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "quit")
     {
         setVisible(false);
-        current_npc = 0;
+        if (current_npc) current_npc->handleDeath();
         return;
     }
 
@@ -155,8 +183,17 @@ void SellDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "sell" && mAmountItems > 0
             && mAmountItems <= mMaxItems)
     {
+#ifdef TMWSERV_SUPPORT
         Net::GameServer::Player::tradeWithNPC
             (mShopItems->at(selectedItem)->getId(), mAmountItems);
+#else
+        // Attempt sell
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_NPC_SELL_REQUEST);
+        outMsg.writeInt16(8);
+        outMsg.writeInt16(mShopItems->at(selectedItem)->getInvIndex());
+        outMsg.writeInt16(mAmountItems);
+#endif
 
         mMaxItems -= mAmountItems;
         mShopItems->getShop()->at(selectedItem)->setQuantity(mMaxItems);
@@ -239,7 +276,7 @@ void SellDialog::updateButtonsAndLabels()
 
     // Update the quantity and money labels
     mQuantityLabel->setCaption(strprintf("%d / %d", mAmountItems, mMaxItems));
-    mMoneyLabel->setCaption
-        (strprintf(_("Price: %d GP / Total: %d GP"),
-                   income, mPlayerMoney + income));
+    mMoneyLabel->setCaption(strprintf(_("Price: %s / Total: %s"),
+                    Units::formatCurrency(income).c_str(),
+                    Units::formatCurrency(mPlayerMoney - income).c_str()));
 }