From 6087a18c94e418c43b681accfb72efdef7cb2242 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Mon, 9 Mar 2015 14:58:07 +1100
Subject: [PATCH] Implement clone() using a new Record constructor.

---
 apps/opencs/model/world/record.hpp          | 20 +++++++++++++++++---
 apps/opencs/model/world/refidcollection.cpp |  1 -
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index 2b556636f..1f97ece93 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -38,6 +38,10 @@ namespace CSMWorld
         ESXRecordT mBase;
         ESXRecordT mModified;
 
+        Record() {}
+        Record(State state,
+                const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
+
         virtual RecordBase *clone() const;
 
         virtual void assign (const RecordBase& record);
@@ -58,12 +62,22 @@ namespace CSMWorld
         ///< Merge modified into base.
     };
 
+    template <typename ESXRecordT>
+    Record<ESXRecordT>::Record(State state, const ESXRecordT *base = 0, const ESXRecordT *modified = 0)
+    {
+        if(base)
+            mBase = *base;
+
+        if(modified)
+            mModified = *modified;
+
+        this->mState = state;
+    }
+
     template <typename ESXRecordT>
     RecordBase *Record<ESXRecordT>::clone() const
     {
-        Record<ESXRecordT> *copy = new Record<ESXRecordT> (*this);
-        copy->mModified = (*this).get();
-        return copy;
+        return new Record<ESXRecordT> (State_ModifiedOnly, 0, &(this->get()));
     }
 
     template <typename ESXRecordT>
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index 779d5a40c..011b5cc0e 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -471,7 +471,6 @@ void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
                                      const CSMWorld::UniversalId::Type type)
 {
         std::auto_ptr<RecordBase> newRecord(mData.getRecord(mData.searchId(origin)).clone());
-        newRecord->mState = RecordBase::State_ModifiedOnly;
         mAdapters.find(type)->second->setId(*newRecord, destination);
         mData.insertRecord(*newRecord, type, destination);
 }