INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 06:49:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Include filesize when opening a file with searchpaths

Browse Source
This commit is contained in:
Jan
2021-03-13 10:27:18 +01:00
parent 62247cecda
commit 83080db991
11 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ObjLoading/Game/T6/ObjLoaderT6.cpp
View File

@ -36,9 +36,9 @@ namespace T6
const auto ipakFilename = ipakName + ".ipak";
auto file = searchPath->Open(ipakFilename);
if (file)
if (file.IsOpen())
{
auto ipak = std::make_unique<IPak>(ipakFilename, std::move(file));
auto ipak = std::make_unique<IPak>(ipakFilename, std::move(file.m_stream));
if (ipak->Initialize())
{
@ -168,9 +168,9 @@ namespace T6
{
const auto filePathImage = searchPath->Open(imageFileName);
if (filePathImage)
if (filePathImage.IsOpen())
{
loadedTexture = loader.LoadIwi(*filePathImage);
loadedTexture = loader.LoadIwi(*filePathImage.m_stream);
}
}
}