games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Data types in CArchiveLoader::extractToFolder() made more simple.

Browse Source
This commit is contained in:
krs
2022-11-22 19:26:07 +02:00
parent d516a5f529
commit 31b7a81cd2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/filesystem/CArchiveLoader.cpp
View File

@@ -215,34 +215,33 @@ void CArchiveLoader::extractToFolder(std::string outputSubFolder, CFileInputStre
{ {
si64 currentPosition = fileStream.tell(); // save filestream position si64 currentPosition = fileStream.tell(); // save filestream position
std::unique_ptr<char[]> data = std::unique_ptr<char[]>(new char[entry.fullSize]); std::vector<ui8> data(entry.fullSize);
fileStream.seek(entry.offset); fileStream.seek(entry.offset);
fileStream.read((ui8*)data.get(), entry.fullSize); fileStream.read(data.data(), entry.fullSize);
bfs::path extractedFilePath = createExtractedFilePath(outputSubFolder, entry.name); bfs::path extractedFilePath = createExtractedFilePath(outputSubFolder, entry.name);
// writeToOutputFile // writeToOutputFile
std::ofstream out(extractedFilePath.string(), std::ofstream::binary); std::ofstream out(extractedFilePath.string(), std::ofstream::binary);
out.exceptions(std::ifstream::failbit | std::ifstream::badbit); out.exceptions(std::ifstream::failbit | std::ifstream::badbit);
out.write(data.get(), entry.fullSize); out.write((char*)&data[0], entry.fullSize);
fileStream.seek(currentPosition); // restore filestream position fileStream.seek(currentPosition); // restore filestream position
} }
void CArchiveLoader::extractToFolder(std::string outputSubFolder, const std::string & mountPoint, ArchiveEntry entry) void CArchiveLoader::extractToFolder(std::string outputSubFolder, const std::string & mountPoint, ArchiveEntry entry)
{ {
std::unique_ptr<CInputStream> inputStream = load(ResourceID(mountPoint + entry.name)); std::unique_ptr<CInputStream> inputStream = load(ResourceID(mountPoint + entry.name));
std::unique_ptr<char[]> data = std::unique_ptr<char[]>(new char[entry.fullSize]); std::vector<ui8> data(entry.fullSize);
inputStream->read((ui8*)data.get(), entry.fullSize); inputStream->read(data.data(), entry.fullSize);
bfs::path extractedFilePath = createExtractedFilePath(outputSubFolder, entry.name); bfs::path extractedFilePath = createExtractedFilePath(outputSubFolder, entry.name);
// writeToOutputFile // writeToOutputFile
std::ofstream out(extractedFilePath.string(), std::ofstream::binary); std::ofstream out(extractedFilePath.string(), std::ofstream::binary);
out.exceptions(std::ifstream::failbit | std::ifstream::badbit); out.exceptions(std::ifstream::failbit | std::ifstream::badbit);
out.write(data.get(), entry.fullSize); out.write((char*)&data[0], entry.fullSize);
} }
bfs::path createExtractedFilePath(const std::string & outputSubFolder, const std::string & entryName) bfs::path createExtractedFilePath(const std::string & outputSubFolder, const std::string & entryName)