From 0f971163f709e31f98810b8ecf205faea19f96e2 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 1 Dec 2013 14:50:25 +0100
Subject: [PATCH] use Entry instead of plain string for topic and quest entries

---
 apps/openmw/mwdialogue/quest.cpp       | 4 ++--
 apps/openmw/mwdialogue/topic.cpp       | 6 +-----
 apps/openmw/mwdialogue/topic.hpp       | 4 ++--
 apps/openmw/mwgui/journalviewmodel.cpp | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index 75dcaa028..12763effd 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -82,9 +82,9 @@ namespace MWDialogue
         setIndex (index);
 
         for (TEntryIter iter (mEntries.begin()); iter!=mEntries.end(); ++iter)
-            if (*iter==entry.mInfoId)
+            if (iter->mInfoId==entry.mInfoId)
                 return;
 
-        mEntries.push_back (entry.mInfoId);
+        mEntries.push_back (entry); // we want slicing here
     }
 }
diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index fc8545b5e..f40e585dc 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -24,11 +24,7 @@ namespace MWDialogue
         if (entry.mTopic!=mTopic)
             throw std::runtime_error ("topic does not match: " + mTopic);
 
-        for (TEntryIter iter = begin(); iter!=end(); ++iter)
-            if (*iter==entry.mInfoId)
-                return;
-
-        mEntries.push_back (entry.mInfoId);
+        mEntries.push_back (entry); // we want slicing here
     }
 
     std::string Topic::getName() const
diff --git a/apps/openmw/mwdialogue/topic.hpp b/apps/openmw/mwdialogue/topic.hpp
index 17601977a..ffc5e9470 100644
--- a/apps/openmw/mwdialogue/topic.hpp
+++ b/apps/openmw/mwdialogue/topic.hpp
@@ -13,14 +13,14 @@ namespace MWDialogue
     {
         public:
 
-            typedef std::vector<std::string> TEntryContainer;
+            typedef std::vector<Entry> TEntryContainer;
             typedef TEntryContainer::const_iterator TEntryIter;
 
         protected:
 
             std::string mTopic;
             std::string mName;
-            TEntryContainer mEntries; // info-IDs
+            TEntryContainer mEntries;
 
         public:
 
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 7ee24a288..ad0af3f05 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -268,7 +268,7 @@ struct JournalViewModelImpl : JournalViewModel
             {
                 for (MWDialogue::Topic::TEntryIter j = quest->begin (); j != quest->end (); ++j)
                 {
-                    if (i->mInfoId == *j)
+                    if (i->mInfoId == j->mInfoId)
                         visitor (JournalEntryImpl <MWBase::Journal::TEntryIter> (this, i));
                 }
             }
@@ -317,7 +317,7 @@ struct JournalViewModelImpl : JournalViewModel
 
         std::string getText () const
         {
-            return  mTopic.getEntry (*itr).getText();
+            return  itr->getText();
         }
 
         Utf8Span source () const