mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2024-12-29 03:19:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge the two identical conditions

Browse Source
This commit is contained in:
Cédric Mocquillon 2023-03-06 21:25:53 +01:00
parent 1a7b2cd611
commit 64ce6eb6bc
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/bsa/bsa_file.cpp
View File

@ -350,7 +350,7 @@ BsaVersion Bsa::BSAFile::detectVersion(const std::filesystem::path& filePath)
return BSAVER_UNCOMPRESSED;
}
if (head[0] == static_cast<uint32_t>(BSAVER_COMPRESSED))
if (head[0] == static_cast<uint32_t>(BSAVER_COMPRESSED) || head[0] == ESM::fourCC("BTDX"))
{
if (head[1] == static_cast<uint32_t>(0x01))
{
@ -363,17 +363,5 @@ BsaVersion Bsa::BSAFile::detectVersion(const std::filesystem::path& filePath)
return BSAVER_COMPRESSED;
}
if (head[0] == ESM::fourCC("BTDX"))
{
if (head[1] == static_cast<uint32_t>(0x01))
{
if (head[2] == ESM::fourCC("GNRL"))
return BSAVER_BA2_GNRL;
if (head[2] == ESM::fourCC("DX10"))
return BSAVER_BA2_DX10;
}
return BSAVER_COMPRESSED;
}
return BSAVER_UNKNOWN;
}