removed indirection in OpenMW-CS land record

apps/opencs/model/doc/savingstages.cpp

@@ -416,16 +416,16 @@ void CSMDoc::WriteLandCollectionStage::perform (int stage, Messages& messages)
     if (land.mState==CSMWorld::RecordBase::State_Modified ||
         land.mState==CSMWorld::RecordBase::State_ModifiedOnly)
     {
-        CSMWorld::Land record = land.get();
+        const CSMWorld::Land& record = land.get();
 
-        mState.getWriter().startRecord (record.mLand->sRecordId);
+        mState.getWriter().startRecord (record.sRecordId);
 
-        record.mLand->save (mState.getWriter());
+        record.save (mState.getWriter());
 
-        if (const ESM::Land::LandData *data = record.mLand->getLandData (record.mLand->mDataTypes))
+        if (const ESM::Land::LandData *data = record.getLandData (record.mDataTypes))
             data->save (mState.getWriter());
 
-        mState.getWriter().endRecord (record.mLand->sRecordId);
+        mState.getWriter().endRecord (record.sRecordId);
     }
     else if (land.mState==CSMWorld::RecordBase::State_Deleted)
     {

apps/opencs/model/tools/mergestages.cpp

@@ -124,7 +124,7 @@ void CSMTools::ListLandTexturesMergeStage::perform (int stage, CSMDoc::Messages&
 
     if (!record.isDeleted())
     {
-        ESM::Land& land = *record.get().mLand;
+        const ESM::Land& land = record.get();
 
         // make sure record is loaded
         land.loadData (ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |

apps/opencs/model/world/data.cpp

@@ -773,6 +773,11 @@ const CSMWorld::IdCollection<CSMWorld::Land>& CSMWorld::Data::getLand() const
     return mLand;
 }
 
+CSMWorld::IdCollection<CSMWorld::Land>& CSMWorld::Data::getLand()
+{
+    return mLand;
+}
+
 const CSMWorld::IdCollection<CSMWorld::LandTexture>& CSMWorld::Data::getLandTextures() const
 {
     return mLandTextures;
@@ -951,7 +956,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
             int index = mLand.load(*mReader, mBase);
 
             if (index!=-1 && !mBase)
-                mLand.getRecord (index).mModified.mLand->loadData (
+                mLand.getRecord (index).mModified.loadData (
                     ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR |
                     ESM::Land::DATA_VTEX | ESM::Land::DATA_WNAM);
 

apps/opencs/model/world/data.hpp

@@ -232,6 +232,8 @@ namespace CSMWorld
 
             const IdCollection<CSMWorld::Land>& getLand() const;
 
+            IdCollection<CSMWorld::Land>& getLand();
+
             const IdCollection<CSMWorld::LandTexture>& getLandTextures() const;
 
             IdCollection<CSMWorld::LandTexture>& getLandTextures();

apps/opencs/model/world/land.cpp

@@ -4,25 +4,13 @@
 
 namespace CSMWorld
 {
-
-    Land::Land()
-    {
-        mLand.reset(new ESM::Land());
-    }
-
     void Land::load(ESM::ESMReader &esm)
     {
-        mLand->load(esm);
+        ESM::Land::load(esm);
 
         std::ostringstream stream;
-        stream << "#" << mLand->mX << " " << mLand->mY;
+        stream << "#" << mX << " " << mY;
 
         mId = stream.str();
     }
-
-    void Land::blank()
-    {
-        /// \todo
-    }
-
 }

apps/opencs/model/world/land.hpp

@@ -2,7 +2,7 @@
 #define CSM_WORLD_LAND_H
 
 #include <string>
-#include <boost/shared_ptr.hpp>
+
 #include <components/esm/loadland.hpp>
 
 namespace CSMWorld
@@ -11,18 +11,12 @@ namespace CSMWorld
     ///
     /// \todo Add worldspace support to the Land record.
     /// \todo Add a proper copy constructor (currently worked around using shared_ptr)
-    struct Land
+    struct Land : public ESM::Land
     {
-        Land();
-
-        boost::shared_ptr<ESM::Land> mLand;
-
         std::string mId;
 
         /// Loads the metadata and ID
         void load (ESM::ESMReader &esm);
-
-        void blank();
     };
 }
 

apps/opencs/view/render/cell.cpp

@@ -68,15 +68,16 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     int landIndex = land.searchId(mId);
     if (landIndex != -1)
     {
-        const ESM::Land* esmLand = land.getRecord(mId).get().mLand.get();
+        const ESM::Land& esmLand = land.getRecord(mId).get();
-        if(esmLand && esmLand->mDataTypes&ESM::Land::DATA_VHGT)
+
+        if (esmLand.getLandData (ESM::Land::DATA_VHGT))
         {
             mTerrain.reset(new Terrain::TerrainGrid(mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Element_Terrain<<1));
-            mTerrain->loadCell(esmLand->mX,
+            mTerrain->loadCell(esmLand.mX,
-                               esmLand->mY);
+                               esmLand.mY);
 
-            mX = esmLand->mX;
+            mX = esmLand.mX;
-            mY = esmLand->mY;
+            mY = esmLand.mY;
         }
     }
 }

apps/opencs/view/render/terrainstorage.cpp

@@ -20,11 +20,10 @@ namespace CSVRender
         if (index == -1)
             return NULL;
 
-        ESM::Land* land = mData.getLand().getRecord(index).get().mLand.get();
+        const ESM::Land& land = mData.getLand().getRecord(index).get();
         int mask = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
-        if (!land->isDataLoaded(mask))
+        land.loadData (mask);
-            land->loadData(mask);
+        return &land;
-        return land;
     }
 
     const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)