From 04cca2a1ce85e73e9fe0d4a6e3b948b7ebf5d603 Mon Sep 17 00:00:00 2001
From: lazydev <lazydev@nomail>
Date: Wed, 2 Jan 2013 18:58:52 +0400
Subject: [PATCH] fix for http://bugs.openmw.org/issues/517

---
 apps/openmw/mwgui/container.cpp   |  8 ++++----
 apps/openmw/mwgui/tradewindow.cpp | 16 ++++++++++------
 apps/openmw/mwgui/tradewindow.hpp |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 20bc95445..479a82efa 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -195,13 +195,13 @@ void ContainerBase::sellAlreadyBoughtItem(MyGUI::Widget* _sender, int count)
     if (isInventory())
     {
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->addItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count, true);
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->drawItems();
     }
     else
     {
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->addItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count, true);
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->drawItems();
     }
 
@@ -218,13 +218,13 @@ void ContainerBase::sellItem(MyGUI::Widget* _sender, int count)
     if (isInventory())
     {
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->addBarteredItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count, false);
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->drawItems();
     }
     else
     {
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->addBarteredItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count, false);
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->drawItems();
     }
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index a005c618f..51eb3d87e 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -401,19 +401,23 @@ namespace MWGui
         return items;
     }
 
-    void TradeWindow::sellToNpc(MWWorld::Ptr item, int count)
+    void TradeWindow::sellToNpc(MWWorld::Ptr item, int count, bool boughtItem)
     {
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, boughtItem);
+
+        mCurrentBalance += diff;
+        mCurrentMerchantOffer += diff;
 
-        mCurrentBalance -= MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,true);
-        mCurrentMerchantOffer -= MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,true);
         updateLabels();
     }
 
-    void TradeWindow::buyFromNpc(MWWorld::Ptr item, int count)
+    void TradeWindow::buyFromNpc(MWWorld::Ptr item, int count, bool soldItem)
     {
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, !soldItem);
+
+        mCurrentBalance -= diff;
+        mCurrentMerchantOffer -= diff;
 
-        mCurrentBalance += MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,false);
-        mCurrentMerchantOffer += MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,false);
         updateLabels();
     }
 
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index db386d8b6..219e44036 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -27,8 +27,8 @@ namespace MWGui
 
             void startTrade(MWWorld::Ptr actor);
 
-            void sellToNpc(MWWorld::Ptr item, int count); ///< only used for adjusting the gold balance
-            void buyFromNpc(MWWorld::Ptr item, int count); ///< only used for adjusting the gold balance
+            void sellToNpc(MWWorld::Ptr item, int count, bool boughtItem); ///< only used for adjusting the gold balance
+            void buyFromNpc(MWWorld::Ptr item, int count, bool soldItem); ///< only used for adjusting the gold balance
 
             bool npcAcceptsItem(MWWorld::Ptr item);