From 9d64c92d33efb3aac740e3cbe5f8afa8607434f9 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 30 Nov 2013 11:57:33 +0100
Subject: [PATCH] store text in journal entries

---
 apps/openmw/mwdialogue/journalentry.cpp | 16 +++++++++++-----
 apps/openmw/mwdialogue/journalentry.hpp |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index dd1ad3f66..20963eb79 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -14,21 +14,27 @@ namespace MWDialogue
 
     JournalEntry::JournalEntry (const std::string& topic, const std::string& infoId)
     : mTopic (topic), mInfoId (infoId)
-    {}
-
-    std::string JournalEntry::getText (const MWWorld::ESMStore& store) const
     {
         const ESM::Dialogue *dialogue =
-            store.get<ESM::Dialogue>().find (mTopic);
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (mTopic);
 
         for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mId == mInfoId)
-                return iter->mResponse;
+            {
+                /// \todo text replacement
+                mText = iter->mResponse;
+                return;
+            }
 
         throw std::runtime_error ("unknown info ID " + mInfoId + " for topic " + mTopic);
     }
 
+    std::string JournalEntry::getText (const MWWorld::ESMStore& store) const
+    {
+        return mText;
+    }
+
     JournalEntry JournalEntry::makeFromQuest (const std::string& topic, int index)
     {
         return JournalEntry (topic, idFromIndex (topic, index));
diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp
index 9d009b48b..ab4adece9 100644
--- a/apps/openmw/mwdialogue/journalentry.hpp
+++ b/apps/openmw/mwdialogue/journalentry.hpp
@@ -15,6 +15,7 @@ namespace MWDialogue
     {
         std::string mTopic;
         std::string mInfoId;
+        std::string mText;
 
         JournalEntry();