modeco80/EuropaTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libeuropa/io: Fix PakWriter AlignBy() so it actually works

Browse source 
Oops. This makes sector alignment actually work for writing sector aligned paks now.
This commit is contained in:
Lily Tsuru 2025-01-08 13:25:49 -05:00
parent 341f914e1d
commit 6fa9f7122b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libeuropa/io/PakWriter.cpp
View file

@ -29,11 +29,11 @@ namespace europa::io {
this->version = version;
}
// move to a util/ header
// FIXME: It would be nice to move to a util/ header
template <class T>
constexpr T AlignBy(T value, std::size_t alignment) {
return (-value) & (alignment - 1);
return static_cast<T>(((value + (alignment - 1)) & ~(alignment - 1)));
}
void PakWriter::Write(std::ostream& os, std::vector<FlattenedType>&& vec, PakProgressReportSink& sink, SectorAlignment sectorAlignment) {
@ -77,7 +77,7 @@ namespace europa::io {
// Align first file to sector boundary.
if(sectorAlignment == SectorAlignment::Align)
os.seekp(
AlignBy(os.tellp(), kCDSectorSize),
AlignBy(static_cast<int>(os.tellp()), kCDSectorSize),
std::istream::beg);
// Write all the file data
@ -118,7 +118,7 @@ namespace europa::io {
// Align to sector boundary.
if(sectorAlignment == SectorAlignment::Align)
os.seekp(
AlignBy(os.tellp(), kCDSectorSize),
AlignBy(static_cast<int>(os.tellp()), kCDSectorSize),
std::istream::beg);
sink.OnEvent({ PakProgressReportSink::FileEvent::EventCode::FileWriteEnd,