mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
Code Issues Projects Releases Wiki Activity

Reset dialogue history when the window can't track what closed it

Browse Source
This commit is contained in:
Capostrophic 2020-04-14 08:49:14 +03:00
parent 94c1672e73
commit fbcc8ef046
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwgui/dialogue.cpp
View File

@ -355,7 +355,6 @@ namespace MWGui
{
if (exit())
{
resetHistory();
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Dialogue);
}
}
@ -476,8 +475,9 @@ namespace MWGui
mDeleteLater.clear();
}
void DialogueWindow::resetHistory()
void DialogueWindow::onClose()
{
// Reset history
for (DialogueText* text : mHistoryContents)
delete text;
mHistoryContents.clear();
@ -663,7 +663,6 @@ namespace MWGui
void DialogueWindow::onGoodbyeActivated()
{
resetHistory();
MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
resetReference();
@ -718,7 +717,6 @@ namespace MWGui
void DialogueWindow::onReferenceUnavailable()
{
resetHistory();
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Dialogue);
}

3
apps/openmw/mwgui/dialogue.hpp
View File

@ -133,6 +133,8 @@ namespace MWGui
void updateTopics();
void onClose();
protected:
void updateTopicsPane();
bool isCompanion(const MWWorld::Ptr& actor);
@ -156,7 +158,6 @@ namespace MWGui
void updateDisposition();
void restock();
void deleteLater();
void resetHistory();
bool mIsCompanion;
std::list<std::string> mKeywords;