teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove redundant resetHistory argument

Browse source
This commit is contained in:
scrawl 2017-09-25 19:58:34 +02:00
parent e14573fa8c
commit 717e68fab2
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -127,9 +127,6 @@ namespace MWDialogue
MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
// If the dialogue window was already open, keep the existing history
bool resetHistory = (!MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Dialogue));
//greeting
const MWWorld::Store<ESM::Dialogue> &dialogs =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
@ -145,7 +142,7 @@ namespace MWDialogue
{
//initialise the GUI
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue);
win->startDialogue(actor, actor.getClass().getName (actor), resetHistory);
win->startDialogue(actor, actor.getClass().getName (actor));
creatureStats.talkedToPlayer();

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

@ -283,6 +283,7 @@ namespace MWGui
}
else
{
resetReference();
MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
mTopicsList->scrollToTop();
return true;
@ -357,7 +358,7 @@ namespace MWGui
}
}
void DialogueWindow::startDialogue(MWWorld::Ptr actor, std::string npcName, bool resetHistory)
void DialogueWindow::startDialogue(MWWorld::Ptr actor, std::string npcName)
{
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
@ -372,7 +373,7 @@ namespace MWGui
mTopicsList->clear();
if (resetHistory || !sameActor)
if (!sameActor)
{
for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it)
delete (*it);

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

@ -108,7 +108,7 @@ namespace MWGui
void notifyLinkClicked (TypesetBook::InteractiveId link);
void startDialogue(MWWorld::Ptr actor, std::string npcName, bool resetHistory);
void startDialogue(MWWorld::Ptr actor, std::string npcName);
void setKeywords(std::list<std::string> keyWord);
void addResponse (const std::string& text, const std::string& title="", bool needMargin = true);