mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-12 22:14:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bsaloading' into 'master'

Browse Source 
Allow BSA string tables to contain "padding"

See merge request OpenMW/openmw!3389
This commit is contained in:
psi29a 2023-08-31 08:11:28 +00:00
commit a9fb50e2c7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/bsa/compressedbsafile.cpp
View File

@ -144,8 +144,9 @@ namespace Bsa
input.read(reinterpret_cast<char*>(&file.mOffset), 4); input.read(reinterpret_cast<char*>(&file.mOffset), 4);
} }
} }
if (mHeader.mFolderNamesLength != 0) if (mHeader.mFolderNamesLength != 0)
fail("Failed to read folder names: " + std::to_string(mHeader.mFolderNamesLength) + " bytes remaining"); input.ignore(mHeader.mFolderNamesLength);
if (input.bad()) if (input.bad())
fail("Failed to read compressed BSA file records: input error"); fail("Failed to read compressed BSA file records: input error");
@ -172,13 +173,13 @@ namespace Bsa
file.mName.insert(file.mName.begin() + folder.mName.size(), '\\'); file.mName.insert(file.mName.begin() + folder.mName.size(), '\\');
} }
} }
if (input.bad())
fail("Failed to read compressed BSA filenames: input error");
} }
if (mHeader.mFileNamesLength != 0) if (mHeader.mFileNamesLength != 0)
fail("Failed to read file names: " + std::to_string(mHeader.mFileNamesLength) + " bytes remaining"); input.ignore(mHeader.mFileNamesLength);
if (input.bad())
fail("Failed to read compressed BSA filenames: input error");
for (auto& [folder, filelist] : folders) for (auto& [folder, filelist] : folders)
{ {