mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-06 18:45:32 +00:00
Merge pull request #2779 from Capostrophic/dialogue
Reset dialogue history when the window can't track what closed it
This commit is contained in:
commit
0364e0abc2
2 changed files with 4 additions and 5 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue