From 94aeb152202798757e1a246b9e22de953d401454 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 10 Nov 2012 00:38:45 +0100
Subject: [PATCH] bartering disposition change

---
 apps/openmw/mwbase/dialoguemanager.hpp        |  1 +
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 12 ++++++++++--
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp |  1 +
 apps/openmw/mwgui/tradewindow.cpp             | 14 +++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwbase/dialoguemanager.hpp b/apps/openmw/mwbase/dialoguemanager.hpp
index e9854b246d..2181ddb588 100644
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@@ -43,6 +43,7 @@ namespace MWBase
 
             virtual void persuade (int type) = 0;
             virtual int getTemporaryDispositionChange () const = 0;
+            virtual void applyTemporaryDispositionChange (int delta) = 0;
     };
 }
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 3eabe73836..60ccda09fe 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -873,8 +873,11 @@ namespace MWDialogue
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
 
         // Apply disposition change to NPC's base disposition
-        MWMechanics::NpcStats npcStats = MWWorld::Class::get(mActor).getNpcStats(mActor);
-        npcStats.setBaseDisposition(npcStats.getBaseDisposition() + mPermanentDispositionChange);
+        if (mActor.getTypeName() == typeid(ESM::NPC).name())
+        {
+            MWMechanics::NpcStats npcStats = MWWorld::Class::get(mActor).getNpcStats(mActor);
+            npcStats.setBaseDisposition(npcStats.getBaseDisposition() + mPermanentDispositionChange);
+        }
         mPermanentDispositionChange = 0;
         mTemporaryDispositionChange = 0;
     }
@@ -1001,4 +1004,9 @@ namespace MWDialogue
     {
         return mTemporaryDispositionChange;
     }
+
+    void DialogueManager::applyTemporaryDispositionChange(int delta)
+    {
+        mTemporaryDispositionChange += delta;
+    }
 }
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index d0f48b65a8..a8dea3dbab 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -74,6 +74,7 @@ namespace MWDialogue
 
             virtual void persuade (int type);
             virtual int getTemporaryDispositionChange () const;
+            virtual void applyTemporaryDispositionChange (int delta);
     };
 }
 
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 0707ad985a..c6a21c461f 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -7,6 +7,7 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
@@ -206,7 +207,8 @@ namespace MWGui
             if (mCurrentMerchantOffer<0) d = int(100 * (a - b) / a);
             else d = int(100 * (b - a) / a);
 
-            float clampedDisposition = std::max<int>(0,std::min<int>(int(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)),100));
+            float clampedDisposition = std::max<int>(0,std::min<int>(int(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
+                + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()),100));
 
             MWMechanics::NpcStats sellerSkill = MWWorld::Class::get(mPtr).getNpcStats(mPtr);
             MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(mPtr).getCreatureStats(mPtr); 
@@ -232,13 +234,15 @@ namespace MWGui
             {
                 MWBase::Environment::get().getWindowManager()->
                     messageBox("#{sNotifyMessage9}", std::vector<std::string>());
-                /// \todo adjust npc temporary disposition by iBarterSuccessDisposition or iBarterFailDisposition
-                return ;
+
+                int iBarterFailDisposition = gmst.find("iBarterFailDisposition")->getInt();
+                MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterFailDisposition);
+                return;
             }
         }
 
-
-/// \todo adjust npc temporary disposition by iBarterSuccessDisposition or iBarterFailDisposition
+        int iBarterSuccessDisposition = gmst.find("iBarterSuccessDisposition")->getInt();
+        MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterSuccessDisposition);
 
         // success! make the item transfer.
         transferBoughtItems();