diff --git a/apps/openmw/mwbase/journal.hpp b/apps/openmw/mwbase/journal.hpp
index 81b4ba0b4b..56d9601fc5 100644
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@@ -54,7 +54,7 @@ namespace MWBase
virtual int getJournalIndex (const std::string& id) const = 0;
///< Get the journal index.
- virtual void addTopic (const std::string& topicId, const std::string& infoId) = 0;
+ virtual void addTopic (const std::string& topicId, const std::string& infoId, const std::string& actorName) = 0;
virtual TEntryIter begin() const = 0;
///< Iterator pointing to the begin of the main journal.
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 7fbebb9d7d..845c3c07be 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -286,7 +286,7 @@ namespace MWDialogue
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext), title);
- MWBase::Environment::get().getJournal()->addTopic (topic, info->mId);
+ MWBase::Environment::get().getJournal()->addTopic (topic, info->mId, mActor.getClass().getName(mActor));
executeScript (info->mResultScript);
@@ -451,7 +451,7 @@ namespace MWDialogue
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addResponse (Interpreter::fixDefinesDialog(text, interpreterContext));
- MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId);
+ MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId, mActor.getClass().getName(mActor));
executeScript (info->mResultScript);
}
}
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 7828d18ad7..9463e4c45b 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -32,7 +32,7 @@ namespace MWDialogue
throw std::runtime_error ("unknown info ID " + mInfoId + " for topic " + topic);
}
- Entry::Entry (const ESM::JournalEntry& record) : mInfoId (record.mInfo), mText (record.mText) {}
+ Entry::Entry (const ESM::JournalEntry& record) : mInfoId (record.mInfo), mText (record.mText), mActorName(record.mActorName) {}
std::string Entry::getText() const
{
@@ -43,6 +43,7 @@ namespace MWDialogue
{
entry.mInfo = mInfoId;
entry.mText = mText;
+ entry.mActorName = mActorName;
}
@@ -53,7 +54,7 @@ namespace MWDialogue
{}
JournalEntry::JournalEntry (const ESM::JournalEntry& record)
- : Entry (record), mTopic (record.mTopic)
+ : Entry (record), mTopic (record.mTopic)
{}
void JournalEntry::write (ESM::JournalEntry& entry) const
diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp
index 18d022aab9..a77ba4f7cf 100644
--- a/apps/openmw/mwdialogue/journalentry.hpp
+++ b/apps/openmw/mwdialogue/journalentry.hpp
@@ -15,6 +15,7 @@ namespace MWDialogue
{
std::string mInfoId;
std::string mText;
+ std::string mActorName; // optional
Entry();
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index f24a93356d..26383b3a7b 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -103,11 +103,13 @@ namespace MWDialogue
quest.setIndex (index);
}
- void Journal::addTopic (const std::string& topicId, const std::string& infoId)
+ void Journal::addTopic (const std::string& topicId, const std::string& infoId, const std::string& actorName)
{
Topic& topic = getTopic (topicId);
- topic.addEntry (JournalEntry (topicId, infoId));
+ JournalEntry entry(topicId, infoId);
+ entry.mActorName = actorName;
+ topic.addEntry (entry);
}
int Journal::getJournalIndex (const std::string& id) const
diff --git a/apps/openmw/mwdialogue/journalimp.hpp b/apps/openmw/mwdialogue/journalimp.hpp
index 86091a12d2..1b4803ba21 100644
--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@@ -38,7 +38,7 @@ namespace MWDialogue
virtual int getJournalIndex (const std::string& id) const;
///< Get the journal index.
- virtual void addTopic (const std::string& topicId, const std::string& infoId);
+ virtual void addTopic (const std::string& topicId, const std::string& infoId, const std::string& actorName);
virtual TEntryIter begin() const;
///< Iterator pointing to the begin of the main journal.
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 3464f283d1..a0d67b0256 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -311,8 +311,6 @@ struct JournalViewModelImpl : JournalViewModel
{
MWDialogue::Topic const & mTopic;
- mutable std::string source_buffer;
-
TopicEntryImpl (JournalViewModelImpl const * model, MWDialogue::Topic const & topic, iterator_t itr) :
BaseEntry (model, itr), mTopic (topic)
{}
@@ -324,9 +322,7 @@ struct JournalViewModelImpl : JournalViewModel
Utf8Span source () const
{
- if (source_buffer.empty ())
- source_buffer = "someone";
- return toUtf8Span (source_buffer);
+ return toUtf8Span (itr->mActorName);
}
};
diff --git a/components/esm/journalentry.cpp b/components/esm/journalentry.cpp
index 514bf35972..445213de40 100644
--- a/components/esm/journalentry.cpp
+++ b/components/esm/journalentry.cpp
@@ -17,6 +17,8 @@ void ESM::JournalEntry::load (ESMReader &esm)
esm.getHNT (mMonth, "JEMO");
esm.getHNT (mDayOfMonth, "JEDM");
}
+ else if (mType==Type_Topic)
+ mActorName = esm.getHNOString("ACT_");
}
void ESM::JournalEntry::save (ESMWriter &esm) const
@@ -32,4 +34,6 @@ void ESM::JournalEntry::save (ESMWriter &esm) const
esm.writeHNT ("JEMO", mMonth);
esm.writeHNT ("JEDM", mDayOfMonth);
}
-}
\ No newline at end of file
+ else if (mType==Type_Topic)
+ esm.writeHNString ("ACT_", mActorName);
+}
diff --git a/components/esm/journalentry.hpp b/components/esm/journalentry.hpp
index 94808dde6b..76901a4b69 100644
--- a/components/esm/journalentry.hpp
+++ b/components/esm/journalentry.hpp
@@ -23,6 +23,7 @@ namespace ESM
std::string mTopic;
std::string mInfo;
std::string mText;
+ std::string mActorName; // Could also be Actor ID to allow switching of localisation, but since mText is plaintext anyway...
int mDay; // time stamp
int mMonth;
int mDayOfMonth;