mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant code

Browse Source
This commit is contained in:
scrawl 2017-09-25 21:47:35 +02:00
parent c5613e384e
commit 476bec41c5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View File

@ -330,14 +330,12 @@ namespace MWDialogue
updateGlobals(); updateGlobals();
std::list<std::string> keywordList; std::list<std::string> keywordList;
int choice = mChoice;
mChoice = -1;
mActorKnownTopics.clear(); mActorKnownTopics.clear();
const MWWorld::Store<ESM::Dialogue> &dialogs = const MWWorld::Store<ESM::Dialogue> &dialogs =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>(); MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
Filter filter (mActor, mChoice, mTalkedTo); Filter filter (mActor, -1, mTalkedTo);
for (MWWorld::Store<ESM::Dialogue>::iterator iter = dialogs.begin(); iter != dialogs.end(); ++iter) for (MWWorld::Store<ESM::Dialogue>::iterator iter = dialogs.begin(); iter != dialogs.end(); ++iter)
{ {
@ -362,8 +360,6 @@ namespace MWDialogue
// sort again, because the previous sort was case-sensitive // sort again, because the previous sort was case-sensitive
keywordList.sort(Misc::StringUtils::ciLess); keywordList.sort(Misc::StringUtils::ciLess);
win->setKeywords(keywordList); win->setKeywords(keywordList);
mChoice = choice;
} }
void DialogueManager::keywordSelected (const std::string& keyword) void DialogueManager::keywordSelected (const std::string& keyword)