Skip to content

Added support for SSE BSAs #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matortheeternal wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added support for SSE BSAs #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2fbf7c
created ssebsa header and cpp file
matortheeternal Dec 5, 2016
e412eae
added ssebsa handling to _bsa_handle_int and libbsa
matortheeternal Dec 5, 2016
6ce1899
fixed some issues due to changes in structure of bsa classes
matortheeternal Dec 5, 2016
7814521
fixed typo in _bsa_handle_int
matortheeternal Dec 5, 2016
6094e84
added ssebsa files to cmakelists
matortheeternal Dec 5, 2016
a59c534
fixed a bit of whitespace
matortheeternal Dec 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,17 @@ set (PROJECT_SRC "${CMAKE_SOURCE_DIR}/src/api/_bsa_handle_int.cpp"
"${CMAKE_SOURCE_DIR}/src/api/genericbsa.cpp"
"${CMAKE_SOURCE_DIR}/src/api/libbsa.cpp"
"${CMAKE_SOURCE_DIR}/src/api/tes3bsa.cpp"
"${CMAKE_SOURCE_DIR}/src/api/tes4bsa.cpp")
"${CMAKE_SOURCE_DIR}/src/api/tes4bsa.cpp"
"${CMAKE_SOURCE_DIR}/src/api/ssebsa.cpp")

set (PROJECT_HEADERS "${CMAKE_SOURCE_DIR}/include/libbsa/libbsa.h"
"${CMAKE_SOURCE_DIR}/src/api/_bsa_handle_int.h"
"${CMAKE_SOURCE_DIR}/src/api/bsa_asset.h"
"${CMAKE_SOURCE_DIR}/src/api/error.h"
"${CMAKE_SOURCE_DIR}/src/api/genericbsa.h"
"${CMAKE_SOURCE_DIR}/src/api/tes3bsa.h"
"${CMAKE_SOURCE_DIR}/src/api/tes4bsa.h")
"${CMAKE_SOURCE_DIR}/src/api/tes4bsa.h"
"${CMAKE_SOURCE_DIR}/src/api/ssebsa.h")

set (TEST_SRC "${CMAKE_SOURCE_DIR}/src/test/main.cpp")

Expand Down
3 changes: 3 additions & 0 deletions src/api/_bsa_handle_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "_bsa_handle_int.h"
#include "tes3bsa.h"
#include "tes4bsa.h"
#include "ssebsa.h"

#include <boost/algorithm/string.hpp>

Expand All @@ -34,6 +35,8 @@ _bsa_handle_int::_bsa_handle_int(const boost::filesystem::path& path) :
extAssetsNum(0) {
if (tes3::BSA::IsBSA(path))
bsa = new tes3::BSA(path);
else if (sse::BSA::IsBSA(path))
bsa = new sse::BSA(path);
else
bsa = new tes4::BSA(path);
}
Expand Down
4 changes: 3 additions & 1 deletion src/api/libbsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "genericbsa.h"
#include "tes3bsa.h"
#include "tes4bsa.h"
#include "ssebsa.h"
#include "error.h"

#include <bitset>
Expand Down Expand Up @@ -67,6 +68,7 @@ const unsigned int LIBBSA_RETURN_MAX = LIBBSA_ERROR_PARSE_FAIL;
const unsigned int LIBBSA_VERSION_TES3 = 0x00000001;
const unsigned int LIBBSA_VERSION_TES4 = 0x00000002;
const unsigned int LIBBSA_VERSION_TES5 = 0x00000004;
const unsigned int LIBBSA_VERSION_SSE = 0x00000005;
/* Use only one compression flag. */
const unsigned int LIBBSA_COMPRESS_LEVEL_0 = 0x00000010;
const unsigned int LIBBSA_COMPRESS_LEVEL_1 = 0x00000020;
Expand Down Expand Up @@ -173,7 +175,7 @@ LIBBSA unsigned int bsa_save(bsa_handle bh,
return c_error(LIBBSA_ERROR_INVALID_ARGS, "Morrowind BSAs cannot be compressed.");

//Check that the version flag is valid.
std::bitset<3> version(flags & (LIBBSA_VERSION_TES3 | LIBBSA_VERSION_TES4 | LIBBSA_VERSION_TES5));
std::bitset<3> version(flags & (LIBBSA_VERSION_TES3 | LIBBSA_VERSION_TES4 | LIBBSA_VERSION_TES5 | LIBBSA_VERSION_SSE));
if (version.none())
return c_error(LIBBSA_ERROR_INVALID_ARGS, "Must specify one version.");
if (version.count() > 1)
Expand Down
Loading