From 4b9852026637ecaf39ac83fceb6d5341d1edca39 Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Thu, 15 May 2025 12:32:05 -0600 Subject: [PATCH] Revert shared addJournalEntry --- apps/openmw/mwscript/dialogueextensions.cpp | 27 +++++++++------------ 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp index 17145e9b32..869b626728 100644 --- a/apps/openmw/mwscript/dialogueextensions.cpp +++ b/apps/openmw/mwscript/dialogueextensions.cpp @@ -22,20 +22,6 @@ namespace MWScript { - static void addJournalEntry(ESM::RefId quest, int index, MWWorld::Ptr ptr) - { - // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :( - try - { - MWBase::Environment::get().getJournal()->addEntry(quest, index, ptr); - } - catch (...) - { - if (MWBase::Environment::get().getJournal()->getJournalIndex(quest) < index) - MWBase::Environment::get().getJournal()->setJournalIndex(quest, index); - } - } - namespace Dialogue { template @@ -54,7 +40,16 @@ namespace MWScript Interpreter::Type_Integer index = runtime[0].mInteger; runtime.pop(); - addJournalEntry(quest, index, ptr); + // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :( + try + { + MWBase::Environment::get().getJournal()->addEntry(quest, index, ptr); + } + catch (...) + { + if (MWBase::Environment::get().getJournal()->getJournalIndex(quest) < index) + MWBase::Environment::get().getJournal()->setJournalIndex(quest, index); + } } }; @@ -105,7 +100,7 @@ namespace MWScript const std::list orderedInfo = it->mInfoOrder.getOrderedInfo(); for (auto info = orderedInfo.begin(); info != orderedInfo.end(); ++info) { - addJournalEntry(quest, info->mData.mJournalIndex, ptr); + MWBase::Environment::get().getJournal()->addEntry(quest, info->mData.mJournalIndex, ptr); } } else if (type == ESM::Dialogue::Type::Topic)