Merge remote-tracking branch 'jeffreyhaines/master'

apps/openmw/mwgui/dialogue.cpp

@@ -64,16 +64,19 @@ namespace MWGui
         else if (sender == mBribe10Button)
         {
             player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 10, player);
+            mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 10, mReceiver);
             type = MWBase::MechanicsManager::PT_Bribe10;
         }
         else if (sender == mBribe100Button)
         {
             player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 100, player);
+            mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 100, mReceiver);
             type = MWBase::MechanicsManager::PT_Bribe100;
         }
         else /*if (sender == mBribe1000Button)*/
         {
             player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 1000, player);
+            mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 10000, mReceiver);
             type = MWBase::MechanicsManager::PT_Bribe1000;
         }
 
@@ -97,6 +100,12 @@ namespace MWGui
         mGoldLabel->setCaptionWithReplacing("#{sGold}: " + boost::lexical_cast<std::string>(playerGold));
     }
 
+    // The receiver of the bribe
+    void PersuasionDialog::setReceiver(MWWorld::Ptr receiver) 
+    {
+        mReceiver = receiver;
+    }
+
     // --------------------------------------------------------------------------------------------------
 
     Response::Response(const std::string &text, const std::string &title)
@@ -371,6 +380,7 @@ namespace MWGui
         mPtr = actor;
         mTopicsList->setEnabled(true);
         setTitle(npcName);
+        mPersuasionDialog.setReceiver(mPtr);
 
         mTopicsList->clear();
 

apps/openmw/mwgui/dialogue.hpp

@@ -35,6 +35,9 @@ namespace MWGui
 
         virtual void open();
 
+        // The receiver of the bribe
+        void setReceiver(MWWorld::Ptr receiver);
+
     private:
         MyGUI::Button* mCancelButton;
         MyGUI::Button* mAdmireButton;
@@ -47,6 +50,9 @@ namespace MWGui
 
         void onCancel (MyGUI::Widget* sender);
         void onPersuade (MyGUI::Widget* sender);
+
+        // The receiver of the bribe
+        MWWorld::Ptr mReceiver;
     };