mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 10:39:42 +00:00
Code Issues Releases Wiki Activity

BGSM Reader: include cleanup, adjust getFile return result

Browse source
This commit is contained in:
Alexei Kotov 2024-04-20 21:20:30 +03:00
parent 77c3cd4467
commit 884668927f
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/bgsm/reader.cpp
View file

@ -4,7 +4,6 @@
#include <stdexcept>
#include <string>
#include "file.hpp"
#include "stream.hpp"
namespace Bgsm

5
components/bgsm/reader.hpp
View file

@ -1,10 +1,7 @@
#ifndef OPENMW_COMPONENTS_BGSM_READER_HPP
#define OPENMW_COMPONENTS_BGSM_READER_HPP
#include <atomic>
#include <cstdint>
#include <memory>
#include <vector>
#include <components/files/istreamptr.hpp>
@ -19,7 +16,7 @@ namespace Bgsm
public:
void parse(Files::IStreamPtr&& stream);
std::unique_ptr<MaterialFile>& getFile() { return mFile; }
std::unique_ptr<MaterialFile> getFile() { return std::move(mFile); }
};
}
#endif

2
components/resource/bgsmfilemanager.cpp
View file

@ -43,7 +43,7 @@ namespace Resource
{
Bgsm::Reader reader;
reader.parse(mVFS->get(name));
Bgsm::MaterialFilePtr file = std::move(reader.getFile());
Bgsm::MaterialFilePtr file = reader.getFile();
obj = new BgsmFileHolder(file);
mCache->addEntryToObjectCache(name.value(), obj);
return file;