Pass land reference to LandObject constructor

apps/opencs/view/render/terrainstorage.cpp

@@ -39,7 +39,7 @@ namespace CSVRender
 
         const ESM::Land& land = mData.getLand().getRecord(index).get();
         return new ESMTerrain::LandObject(
-            &land, ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
+            land, ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX);
     }
 
     const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)

apps/openmw/mwrender/landmanager.cpp

@@ -33,7 +33,7 @@ namespace MWRender
                 const ESM4::Land* land = world->getStore().get<ESM4::Land>().search(cellIndex);
                 if (!land)
                     return nullptr;
-                osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(land, mLoadFlags));
+                osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));
                 mCache->addEntryToObjectCache(cellIndex, landObj.get());
                 return landObj;
             }
@@ -42,7 +42,7 @@ namespace MWRender
                 const ESM::Land* land = world->getStore().get<ESM::Land>().search(cellIndex.mX, cellIndex.mY);
                 if (!land)
                     return nullptr;
-                osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(land, mLoadFlags));
+                osg::ref_ptr<ESMTerrain::LandObject> landObj(new ESMTerrain::LandObject(*land, mLoadFlags));
                 mCache->addEntryToObjectCache(cellIndex, landObj.get());
                 return landObj;
             }

components/esmterrain/storage.cpp

@@ -46,13 +46,13 @@ namespace ESMTerrain
         Map mMap;
     };
 
-    LandObject::LandObject(const ESM4::Land* land, int loadFlags)
+    LandObject::LandObject(const ESM4::Land& land, int loadFlags)
-        : mData(*land, loadFlags)
+        : mData(land, loadFlags)
     {
     }
 
-    LandObject::LandObject(const ESM::Land* land, int loadFlags)
+    LandObject::LandObject(const ESM::Land& land, int loadFlags)
-        : mData(*land, loadFlags)
+        : mData(land, loadFlags)
     {
     }
 

components/esmterrain/storage.hpp

@@ -37,8 +37,8 @@ namespace ESMTerrain
     {
     public:
         LandObject() = default;
-        LandObject(const ESM::Land* land, int loadFlags);
+        LandObject(const ESM::Land& land, int loadFlags);
-        LandObject(const ESM4::Land* land, int loadFlags);
+        LandObject(const ESM4::Land& land, int loadFlags);
 
         META_Object(ESMTerrain, LandObject)