From 83903455f9f22257cbc649ceda6bbd31b96a1c38 Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Thu, 15 May 2025 12:51:53 -0600 Subject: [PATCH] Address review comments --- apps/openmw/mwscript/dialogueextensions.cpp | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp index 869b626728..ab48807c36 100644 --- a/apps/openmw/mwscript/dialogueextensions.cpp +++ b/apps/openmw/mwscript/dialogueextensions.cpp @@ -91,27 +91,23 @@ namespace MWScript = MWBase::Environment::get().getESMStore()->get(); MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr(); - for (auto it = dialogues.begin(); it != dialogues.end(); ++it) + for (const auto& dialogue : dialogues) { - const ESM::Dialogue::Type type = it->mType; - if (type == ESM::Dialogue::Type::Journal) + if (dialogue.mType == ESM::Dialogue::Type::Journal) { - ESM::RefId quest = ESM::RefId::stringRefId(it->mStringId); - const std::list orderedInfo = it->mInfoOrder.getOrderedInfo(); - for (auto info = orderedInfo.begin(); info != orderedInfo.end(); ++info) + for (const auto& journalInfo : dialogue.mInfoOrder.getOrderedInfo()) { - MWBase::Environment::get().getJournal()->addEntry(quest, info->mData.mJournalIndex, ptr); + MWBase::Environment::get().getJournal()->addEntry(dialogue.mId, + journalInfo.mData.mJournalIndex, ptr); } } - else if (type == ESM::Dialogue::Type::Topic) + else if (dialogue.mType == ESM::Dialogue::Type::Topic) { - ESM::RefId topic = ESM::RefId::stringRefId(it->mStringId); - const std::list orderedInfo = it->mInfoOrder.getOrderedInfo(); - for (auto info = orderedInfo.begin(); info != orderedInfo.end(); ++info) + for (const auto& topicInfo : dialogue.mInfoOrder.getOrderedInfo()) { - MWBase::Environment::get().getJournal()->addTopic(topic, info->mId, ptr); + MWBase::Environment::get().getJournal()->addTopic(dialogue.mId, topicInfo.mId, ptr); } - MWBase::Environment::get().getDialogueManager()->addTopic(topic); + MWBase::Environment::get().getDialogueManager()->addTopic(dialogue.mId); } } }