fixed referenceable-loading in case of more than one content file

apps/opencs/model/world/refidcollection.cpp

@@ -432,7 +432,7 @@ void CSMWorld::RefIdCollection::removeRows (int index, int count)
 
 void CSMWorld::RefIdCollection::appendBlankRecord (const std::string& id, UniversalId::Type type)
 {
-    mData.appendRecord (type, id);
+    mData.appendRecord (type, id, false);
 }
 
 int CSMWorld::RefIdCollection::searchId (const std::string& id) const
@@ -450,7 +450,7 @@ void CSMWorld::RefIdCollection::replace (int index, const RecordBase& record)
     mData.getRecord (mData.globalToLocalIndex (index)).assign (record);
 }
 
-void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin, 
+void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
                                      const std::string& destination,
                                      const CSMWorld::UniversalId::Type type)
 {
@@ -467,7 +467,7 @@ void CSMWorld::RefIdCollection::appendRecord (const RecordBase& record,
 
     int index = mData.getAppendIndex (type);
 
-    mData.appendRecord (type, id);
+    mData.appendRecord (type, id, false);
 
     mData.getRecord (mData.globalToLocalIndex (index)).assign (record);
 }
@@ -515,7 +515,7 @@ void CSMWorld::RefIdCollection::load (ESM::ESMReader& reader, bool base, Univers
         {
             // new record
             int index = mData.getAppendIndex (type);
-            mData.appendRecord (type, id);
+            mData.appendRecord (type, id, base);
 
             RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (index);
 

apps/opencs/model/world/refiddata.cpp

@@ -131,7 +131,7 @@ CSMWorld::RecordBase& CSMWorld::RefIdData::getRecord (const LocalIndex& index)
     return iter->second->getRecord (index.first);
 }
 
-void CSMWorld::RefIdData::appendRecord (UniversalId::Type type, const std::string& id)
+void CSMWorld::RefIdData::appendRecord (UniversalId::Type type, const std::string& id, bool base)
 {
     std::map<UniversalId::Type, RefIdDataContainerBase *>::iterator iter =
         mRecordContainers.find (type);
@@ -139,7 +139,7 @@ void CSMWorld::RefIdData::appendRecord (UniversalId::Type type, const std::strin
     if (iter==mRecordContainers.end())
         throw std::logic_error ("invalid local index type");
 
-    iter->second->appendRecord (id);
+    iter->second->appendRecord (id, base);
 
     mIndex.insert (std::make_pair (Misc::StringUtils::lowerCase (id),
         LocalIndex (iter->second->getSize()-1, type)));

apps/opencs/model/world/refiddata.hpp

@@ -45,8 +45,8 @@ namespace CSMWorld
 
         virtual RecordBase& getRecord (int index)= 0;
 
-        virtual void appendRecord (const std::string& id) = 0;
-        
+        virtual void appendRecord (const std::string& id, bool base) = 0;
+
         virtual void insertRecord (RecordBase& record) = 0;
 
         virtual void load (int index,  ESM::ESMReader& reader, bool base) = 0;
@@ -69,8 +69,8 @@ namespace CSMWorld
 
         virtual RecordBase& getRecord (int index);
 
-        virtual void appendRecord (const std::string& id);
-        
+        virtual void appendRecord (const std::string& id, bool base);
+
         virtual void insertRecord (RecordBase& record);
 
         virtual void load (int index,  ESM::ESMReader& reader, bool base);
@@ -88,7 +88,7 @@ namespace CSMWorld
         Record<RecordT>& newRecord = dynamic_cast<Record<RecordT>& >(record);
         mContainer.push_back(newRecord);
     }
-    
+
     template<typename RecordT>
     int RefIdDataContainer<RecordT>::getSize() const
     {
@@ -108,12 +108,15 @@ namespace CSMWorld
     }
 
     template<typename RecordT>
-    void RefIdDataContainer<RecordT>::appendRecord (const std::string& id)
+    void RefIdDataContainer<RecordT>::appendRecord (const std::string& id, bool base)
     {
         Record<RecordT> record;
+
+        record.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
+
+        record.mBase.mId = id;
         record.mModified.mId = id;
-        record.mModified.blank();
-        record.mState = RecordBase::State_ModifiedOnly;
+        (base ? record.mBase : record.mModified).blank();
 
         mContainer.push_back (record);
     }
@@ -206,14 +209,14 @@ namespace CSMWorld
             LocalIndex searchId (const std::string& id) const;
 
             void erase (int index, int count);
-            
+
             void insertRecord(CSMWorld::RecordBase& record, CSMWorld::UniversalId::Type type, const std::string& id);
 
             const RecordBase& getRecord (const LocalIndex& index) const;
 
             RecordBase& getRecord (const LocalIndex& index);
 
-            void appendRecord (UniversalId::Type type, const std::string& id);
+            void appendRecord (UniversalId::Type type, const std::string& id, bool base);
 
             int getAppendIndex (UniversalId::Type type) const;