From 2ccf96f40b4fa7210b2ce313ca0888190a4b8fdf Mon Sep 17 00:00:00 2001 From: yanczi Date: Thu, 2 Oct 2025 15:54:53 +0200 Subject: [PATCH] =?UTF-8?q?Przywrucono=20stary=20uk=C5=82ad=20tablicy=20pl?= =?UTF-8?q?ik=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CreateCargo.cpp | 9 ++++----- ExtractCargo.cpp | 10 +++++----- ViewCargo.cpp | 12 ++++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CreateCargo.cpp b/CreateCargo.cpp index a4b5475..40cfbe6 100644 --- a/CreateCargo.cpp +++ b/CreateCargo.cpp @@ -416,16 +416,15 @@ bool CreateCargo::WriteCargo() for (const auto& head : filesHead) { - // Tablica pliku + // Ścieżka do plików + cargo.write(reinterpret_cast(&head.nameLen), sizeof(head.nameLen)); + cargo.write(head.nameFile.data(), head.nameLen); + cargo.write(reinterpret_cast(&head.hashName), sizeof(head.hashName)); cargo.write(reinterpret_cast(&head.offset), sizeof(head.offset)); cargo.write(reinterpret_cast(&head.size), sizeof(head.size)); cargo.write(reinterpret_cast(&head.crc), sizeof(head.crc)); cargo.write(reinterpret_cast(&head.isZip), sizeof(head.isZip)); - - // Ścieżka do plików - cargo.write(reinterpret_cast(&head.nameLen), sizeof(head.nameLen)); - cargo.write(head.nameFile.data(), head.nameLen); } //Cofnij się na początek pliku diff --git a/ExtractCargo.cpp b/ExtractCargo.cpp index fa170e4..bf5e028 100644 --- a/ExtractCargo.cpp +++ b/ExtractCargo.cpp @@ -136,17 +136,17 @@ void ExtractCargo::LoadFilesTable() for (uint32_t i = 0; i < filesLen; ++i) { FilesTable fhTmp; - cargoFile.read(reinterpret_cast(&fhTmp.hashName), sizeof(fhTmp.hashName)); - cargoFile.read(reinterpret_cast(&fhTmp.offset), sizeof(fhTmp.offset)); - cargoFile.read(reinterpret_cast(&fhTmp.size), sizeof(fhTmp.size)); - cargoFile.read(reinterpret_cast(&fhTmp.crc), sizeof(fhTmp.crc)); - cargoFile.read(reinterpret_cast(&fhTmp.isZip), sizeof(fhTmp.isZip)); cargoFile.read(reinterpret_cast(&fhTmp.nameLen), sizeof(fhTmp.nameLen)); std::vector nameBuffor(fhTmp.nameLen); cargoFile.read(nameBuffor.data(), fhTmp.nameLen); fhTmp.nameFile = std::string(nameBuffor.begin(), nameBuffor.end()); + cargoFile.read(reinterpret_cast(&fhTmp.hashName), sizeof(fhTmp.hashName)); + cargoFile.read(reinterpret_cast(&fhTmp.offset), sizeof(fhTmp.offset)); + cargoFile.read(reinterpret_cast(&fhTmp.size), sizeof(fhTmp.size)); + cargoFile.read(reinterpret_cast(&fhTmp.crc), sizeof(fhTmp.crc)); + cargoFile.read(reinterpret_cast(&fhTmp.isZip), sizeof(fhTmp.isZip)); filesHeads.push_back(fhTmp); } diff --git a/ViewCargo.cpp b/ViewCargo.cpp index 2aa03c0..2a2860e 100644 --- a/ViewCargo.cpp +++ b/ViewCargo.cpp @@ -133,18 +133,18 @@ void ViewCargo::GetFileList(const std::string& path) for (uint32_t i = 0; i < filesLen; ++i) { FilesTable fhTmp; - cargo.read(reinterpret_cast(&fhTmp.hashName), sizeof(fhTmp.hashName)); - cargo.read(reinterpret_cast(&fhTmp.offset), sizeof(fhTmp.offset)); - cargo.read(reinterpret_cast(&fhTmp.size), sizeof(fhTmp.size)); - cargo.read(reinterpret_cast(&fhTmp.crc), sizeof(fhTmp.crc)); - cargo.read(reinterpret_cast(&fhTmp.isZip), sizeof(fhTmp.isZip)); - cargo.read(reinterpret_cast(&fhTmp.nameLen), sizeof(fhTmp.nameLen)); std::vector nameBuffor(fhTmp.nameLen); cargo.read(nameBuffor.data(), fhTmp.nameLen); fhTmp.nameFile = std::string(nameBuffor.begin(), nameBuffor.end()); + cargo.read(reinterpret_cast(&fhTmp.hashName), sizeof(fhTmp.hashName)); + cargo.read(reinterpret_cast(&fhTmp.offset), sizeof(fhTmp.offset)); + cargo.read(reinterpret_cast(&fhTmp.size), sizeof(fhTmp.size)); + cargo.read(reinterpret_cast(&fhTmp.crc), sizeof(fhTmp.crc)); + cargo.read(reinterpret_cast(&fhTmp.isZip), sizeof(fhTmp.isZip)); + //Tworzenie wierszy tabeli CreateTableRow(fhTmp.nameFile, fhTmp.isZip, fhTmp.hashName); }