mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 20:53:50 +00:00
Code Issues Releases Wiki Activity

Make TradeWindow not depend on DialogueWindow

Browse source
This commit is contained in:
scrawl 2017-09-25 18:07:49 +02:00
parent 82a211ba03
commit b7752ec52d
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwgui/dialogue.cpp
View file

@ -270,6 +270,11 @@ namespace MWGui
mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize); mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);
} }
void DialogueWindow::onTradeComplete()
{
addResponse(MyGUI::LanguageManager::getInstance().replaceTags("#{sBarterDialog5}"));
}
bool DialogueWindow::exit() bool DialogueWindow::exit()
{ {
if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice()) if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())

2
apps/openmw/mwgui/dialogue.hpp
View file

@ -99,6 +99,8 @@ namespace MWGui
public: public:
DialogueWindow(); DialogueWindow();
void onTradeComplete();
virtual bool exit(); virtual bool exit();
// Events // Events

4
apps/openmw/mwgui/tradewindow.cpp
View file

@ -27,7 +27,6 @@
#include "containeritemmodel.hpp" #include "containeritemmodel.hpp"
#include "tradeitemmodel.hpp" #include "tradeitemmodel.hpp"
#include "countdialog.hpp" #include "countdialog.hpp"
#include "dialogue.hpp"
#include "controllers.hpp" #include "controllers.hpp"
namespace namespace
@ -358,8 +357,7 @@ namespace MWGui
mPtr.getClass().getCreatureStats(mPtr).getGoldPool() - mCurrentBalance ); mPtr.getClass().getCreatureStats(mPtr).getGoldPool() - mCurrentBalance );
} }
MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addResponse( eventTradeDone();
MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sBarterDialog5")->getString());
MWBase::Environment::get().getWindowManager()->playSound("Item Gold Up"); MWBase::Environment::get().getWindowManager()->playSound("Item Gold Up");
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);

3
apps/openmw/mwgui/tradewindow.hpp
View file

@ -41,6 +41,9 @@ namespace MWGui
virtual void resetReference(); virtual void resetReference();
typedef MyGUI::delegates::CMultiDelegate0 EventHandle_TradeDone;
EventHandle_TradeDone eventTradeDone;
private: private:
ItemView* mItemView; ItemView* mItemView;
SortFilterItemModel* mSortModel; SortFilterItemModel* mSortModel;

2
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -337,7 +337,6 @@ namespace MWGui
mTradeWindow = new TradeWindow(); mTradeWindow = new TradeWindow();
mWindows.push_back(mTradeWindow); mWindows.push_back(mTradeWindow);
trackWindow(mTradeWindow, "barter"); trackWindow(mTradeWindow, "barter");
mGuiModeStates[GM_Barter] = GuiModeState({mInventoryWindow, mTradeWindow}); mGuiModeStates[GM_Barter] = GuiModeState({mInventoryWindow, mTradeWindow});
mConsole = new Console(w,h, mConsoleOnlyScripts); mConsole = new Console(w,h, mConsoleOnlyScripts);
@ -366,6 +365,7 @@ namespace MWGui
mWindows.push_back(mDialogueWindow); mWindows.push_back(mDialogueWindow);
trackWindow(mDialogueWindow, "dialogue"); trackWindow(mDialogueWindow, "dialogue");
mGuiModeStates[GM_Dialogue] = GuiModeState(mDialogueWindow); mGuiModeStates[GM_Dialogue] = GuiModeState(mDialogueWindow);
mTradeWindow->eventTradeDone += MyGUI::newDelegate(mDialogueWindow, &DialogueWindow::onTradeComplete);
ContainerWindow* containerWindow = new ContainerWindow(mDragAndDrop); ContainerWindow* containerWindow = new ContainerWindow(mDragAndDrop);
mWindows.push_back(containerWindow); mWindows.push_back(containerWindow);