mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 21:45:33 +00:00
Code Issues Releases Wiki Activity

Pass land reference to LandObject constructor

Browse source
This commit is contained in:
elsid 2023-08-18 19:00:21 +02:00
parent e6f35373b5
commit 28614730da
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/render/terrainstorage.cpp
View file

@ -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)

4
apps/openmw/mwrender/landmanager.cpp
View file

@ -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;
}

8
components/esmterrain/storage.cpp
View file

@ -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)
{
}

4
components/esmterrain/storage.hpp
View file

@ -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)