From 73a3033e0ffd6a93386890690c1692550159c11a Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Fri, 16 May 2025 11:42:27 -0600 Subject: [PATCH] Get the dialogue manager once --- apps/openmw/mwscript/dialogueextensions.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp index 1c7de21d57..edf6f4b6df 100644 --- a/apps/openmw/mwscript/dialogueextensions.cpp +++ b/apps/openmw/mwscript/dialogueextensions.cpp @@ -89,8 +89,9 @@ namespace MWScript { const MWWorld::Store& dialogues = MWBase::Environment::get().getESMStore()->get(); - MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr(); + MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWBase::Journal* journal = MWBase::Environment::get().getJournal(); + MWBase::DialogueManager* dialogueManager = MWBase::Environment::get().getDialogueManager(); for (const auto& dialogue : dialogues) { @@ -99,16 +100,16 @@ namespace MWScript for (const auto& journalInfo : dialogue.mInfoOrder.getOrderedInfo()) { journal->addEntry( - dialogue.mId, journalInfo.mData.mJournalIndex, ptr); + dialogue.mId, journalInfo.mData.mJournalIndex, playerPtr); } } else if (dialogue.mType == ESM::Dialogue::Type::Topic) { for (const auto& topicInfo : dialogue.mInfoOrder.getOrderedInfo()) { - journal->addTopic(dialogue.mId, topicInfo.mId, ptr); + journal->addTopic(dialogue.mId, topicInfo.mId, playerPtr); } - MWBase::Environment::get().getDialogueManager()->addTopic(dialogue.mId); + dialogueManager->addTopic(dialogue.mId); } } }