mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-23 15:40:42 +00:00
Merge branch 'fix_unity_build' into 'master'
Fix unity build See merge request OpenMW/openmw!1860
This commit is contained in:
commit
3e3cb133bc
@ -7,12 +7,12 @@ namespace MWWorld
|
|||||||
{
|
{
|
||||||
void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
|
void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections, const std::vector<std::string>& groundcoverFiles, ToUTF8::Utf8Encoder* encoder)
|
||||||
{
|
{
|
||||||
EsmLoader::Query query;
|
::EsmLoader::Query query;
|
||||||
query.mLoadStatics = true;
|
query.mLoadStatics = true;
|
||||||
query.mLoadCells = true;
|
query.mLoadCells = true;
|
||||||
|
|
||||||
std::vector<ESM::ESMReader> readers(groundcoverFiles.size());
|
std::vector<ESM::ESMReader> readers(groundcoverFiles.size());
|
||||||
const EsmLoader::EsmData content = EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
|
const ::EsmLoader::EsmData content = ::EsmLoader::loadEsmData(query, groundcoverFiles, fileCollections, readers, encoder);
|
||||||
|
|
||||||
for (const ESM::Static& stat : statics)
|
for (const ESM::Static& stat : statics)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user