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

Address review comments.

Browse Source
This commit is contained in:
JezuzLizard
2023-12-14 13:48:44 -08:00
parent 96e67dc1fa
commit 8b62bc0bc0
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.cpp
View File

@ -19,7 +19,7 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
if (rawFile->len <= 4)
{
std::cout << "Invalid len of animtree file \"" << rawFile->name << "\"" << std::endl;
std::cerr << "Invalid len of animtree file \"" << rawFile->name << "\"" << std::endl;
return;
}
@ -28,7 +28,7 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
if (outLen > ANIMTREE_MAX_SIZE)
{
std::cout << "Invalid size of animtree file \"" << rawFile->name << "\": " << outLen << std::endl;
std::cerr << "Invalid size of animtree file \"" << rawFile->name << "\": " << outLen << std::endl;
return;
}
@ -52,7 +52,6 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
Bytef buffer[0x1000];
size_t writtenSize = 0;
while (zs.avail_in > 0)
{
zs.next_out = buffer;
@ -61,23 +60,14 @@ void AssetDumperRawFile::DumpAnimtree(AssetDumpingContext& context, XAssetInfo<R
if (ret < 0)
{
std::cout << "Inflate failed for dumping animtree file \"" << rawFile->name << "\"" << std::endl;
std::cerr << "Inflate failed for dumping animtree file \"" << rawFile->name << "\"" << std::endl;
inflateEnd(&zs);
return;
}
const auto inflateOutSize = sizeof buffer - zs.avail_out;
if (writtenSize + inflateOutSize >= outLen)
{
// Last byte is a \0 byte. Skip it.
stream.write(reinterpret_cast<char*>(buffer), inflateOutSize - 1);
}
else
{
stream.write(reinterpret_cast<char*>(buffer), inflateOutSize);
}
writtenSize += inflateOutSize;
stream.write(reinterpret_cast<char*>(buffer), inflateOutSize);
}
inflateEnd(&zs);