From 33aecc521848ec949d6d5c00e831b9eb6d1ed5a4 Mon Sep 17 00:00:00 2001 From: Jeffrey Haines Date: Sat, 29 Mar 2014 07:45:36 -0400 Subject: [PATCH 1/3] Revert "made mReceiver private" This reverts commit 3e8f7b3bae9a3e23ad6953fbe79c199da79213aa. --- apps/openmw/mwgui/dialogue.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 368140520..242dae299 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -36,6 +36,7 @@ namespace MWGui virtual void open(); // The receiver of the bribe + MWWorld::Ptr mReceiver; void setReceiver(MWWorld::Ptr receiver); private: @@ -50,9 +51,6 @@ namespace MWGui void onCancel (MyGUI::Widget* sender); void onPersuade (MyGUI::Widget* sender); - - // The receiver of the bribe - MWWorld::Ptr mReceiver; }; From ad9286a30f906c373d453fcaab70abbd7b7f289a Mon Sep 17 00:00:00 2001 From: Jeffrey Haines Date: Sat, 29 Mar 2014 07:45:56 -0400 Subject: [PATCH 2/3] Revert "Revert "made mReceiver private"" This reverts commit 33aecc521848ec949d6d5c00e831b9eb6d1ed5a4. --- apps/openmw/mwgui/dialogue.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 242dae299..368140520 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -36,7 +36,6 @@ namespace MWGui virtual void open(); // The receiver of the bribe - MWWorld::Ptr mReceiver; void setReceiver(MWWorld::Ptr receiver); private: @@ -51,6 +50,9 @@ namespace MWGui void onCancel (MyGUI::Widget* sender); void onPersuade (MyGUI::Widget* sender); + + // The receiver of the bribe + MWWorld::Ptr mReceiver; }; From 6b28c06b2c6401d7a54a2df4e2f329b948acd7ed Mon Sep 17 00:00:00 2001 From: Jeffrey Haines Date: Sat, 29 Mar 2014 07:47:41 -0400 Subject: [PATCH 3/3] Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe --- apps/openmw/mwgui/dialogue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 6cc580fb6..e64c80c90 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -76,7 +76,7 @@ namespace MWGui else /*if (sender == mBribe1000Button)*/ { player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 1000, player); - mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 10000, mReceiver); + mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 1000, mReceiver); type = MWBase::MechanicsManager::PT_Bribe1000; }