mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 10:45:40 +00:00
Code Issues Releases Wiki Activity

Revert MR !103 and !105 since they cause issues with dialogue window

Browse source
This commit is contained in:
Andrei Kortunov 2019-05-14 14:20:27 +04:00
parent fd204fd490
commit a79955352f
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,29 +432,26 @@ namespace MWGui
mGoodbye = false;
mTopicsList->setEnabled(true);
setTitle(mPtr.getClass().getName(mPtr));
updateDisposition();
restock();
}
void DialogueWindow::onOpen()
{
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(mPtr, mGreetingCallback.get()))
if (!MWBase::Environment::get().getDialogueManager()->startDialogue(actor, mGreetingCallback.get()))
{
// No greetings found. The dialogue window should not be shown.
// If this is a companion, we must show the companion window directly (used by BM_bear_be_unique).
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
if (isCompanion(mPtr))
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, mPtr);
mPtr = MWWorld::Ptr();
if (isCompanion(actor))
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Companion, actor);
return;
}
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
setTitle(mPtr.getClass().getName(mPtr));
updateTopics();
updateTopicsPane(); // force update for new services
updateDisposition();
restock();
}
void DialogueWindow::restock()

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

@ -122,8 +122,6 @@ namespace MWGui
void setPtr(const MWWorld::Ptr& actor);
void onOpen();
void setKeywords(std::list<std::string> keyWord);
void addResponse (const std::string& title, const std::string& text, bool needMargin = true);

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

@ -1271,8 +1271,6 @@ namespace MWGui
if (mode==GM_Inventory && mAllowed==GW_None)
return;
for (WindowBase* window : mGuiModeStates[mode].mWindows)
window->setPtr(arg);
if (mGuiModes.empty() || mGuiModes.back() != mode)
{
// If this mode already exists somewhere in the stack, just bring it to the front.
@ -1291,6 +1289,8 @@ namespace MWGui
mGuiModeStates[mode].update(true);
playSound(mGuiModeStates[mode].mOpenSound);
}
for (WindowBase* window : mGuiModeStates[mode].mWindows)
window->setPtr(arg);
mKeyboardNavigation->restoreFocus(mode);