From 28614730da40717898eac0382fc739a0d0b4766c Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 18 Aug 2023 19:00:21 +0200 Subject: [PATCH] Pass land reference to LandObject constructor --- apps/opencs/view/render/terrainstorage.cpp | 2 +- apps/openmw/mwrender/landmanager.cpp | 4 ++-- components/esmterrain/storage.cpp | 8 ++++---- components/esmterrain/storage.hpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp index a6a38600ad..5d2a4874c8 100644 --- a/apps/opencs/view/render/terrainstorage.cpp +++ b/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) diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp index 5078e222b9..cda1954421 100644 --- a/apps/openmw/mwrender/landmanager.cpp +++ b/apps/openmw/mwrender/landmanager.cpp @@ -33,7 +33,7 @@ namespace MWRender const ESM4::Land* land = world->getStore().get().search(cellIndex); if (!land) return nullptr; - osg::ref_ptr landObj(new ESMTerrain::LandObject(land, mLoadFlags)); + osg::ref_ptr 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().search(cellIndex.mX, cellIndex.mY); if (!land) return nullptr; - osg::ref_ptr landObj(new ESMTerrain::LandObject(land, mLoadFlags)); + osg::ref_ptr landObj(new ESMTerrain::LandObject(*land, mLoadFlags)); mCache->addEntryToObjectCache(cellIndex, landObj.get()); return landObj; } diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp index 5df75cc331..fe7f450b1f 100644 --- a/components/esmterrain/storage.cpp +++ b/components/esmterrain/storage.cpp @@ -46,13 +46,13 @@ namespace ESMTerrain Map mMap; }; - LandObject::LandObject(const ESM4::Land* land, int loadFlags) - : mData(*land, loadFlags) + LandObject::LandObject(const ESM4::Land& land, int loadFlags) + : mData(land, loadFlags) { } - LandObject::LandObject(const ESM::Land* land, int loadFlags) - : mData(*land, loadFlags) + LandObject::LandObject(const ESM::Land& land, int loadFlags) + : mData(land, loadFlags) { } diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp index d346c60a4d..465d12071d 100644 --- a/components/esmterrain/storage.hpp +++ b/components/esmterrain/storage.hpp @@ -37,8 +37,8 @@ namespace ESMTerrain { public: LandObject() = default; - LandObject(const ESM::Land* land, int loadFlags); - LandObject(const ESM4::Land* land, int loadFlags); + LandObject(const ESM::Land& land, int loadFlags); + LandObject(const ESM4::Land& land, int loadFlags); META_Object(ESMTerrain, LandObject)