zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-24 17:03:05 +00:00
Code Activity

refactor: fix x64 compilation for ZoneLoading

Browse Source
This commit is contained in:
Jan
2025-04-26 11:45:33 +01:00
committed by Jan Laupetin
parent de43e33dcd
commit 3b00c1d45b
13 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZoneLoading/Loading/Processor/ProcessorInflate.cpp
View File

@@ -50,20 +50,20 @@ public:
size_t Load(void* buffer, const size_t length)
{
m_stream.next_out = static_cast<Bytef*>(buffer);
m_stream.avail_out = length;
m_stream.avail_out = static_cast<unsigned>(length);
while (m_stream.avail_out > 0)
{
if (m_stream.avail_in == 0)
{
m_stream.avail_in = m_base->m_base_stream->Load(m_buffer.get(), m_buffer_size);
m_stream.avail_in = static_cast<unsigned>(m_base->m_base_stream->Load(m_buffer.get(), m_buffer_size));
m_stream.next_in = m_buffer.get();
if (m_stream.avail_in == 0) // EOF
return length - m_stream.avail_out;
}
auto ret = inflate(&m_stream, Z_SYNC_FLUSH);
const auto ret = inflate(&m_stream, Z_SYNC_FLUSH);
if (ret < 0)
throw InvalidCompressionException();

12
src/ZoneLoading/Loading/Processor/ProcessorXChunks.cpp
View File

@@ -78,7 +78,7 @@ public:
m_is_loading = false;
}
uint8_t* GetInputBuffer() const
[[nodiscard]] uint8_t* GetInputBuffer() const
{
return m_input_buffer;
}
@@ -140,9 +140,9 @@ class ProcessorXChunks::ProcessorXChunksImpl
bool m_eof_reached;
unsigned int m_eof_stream;
void AdvanceStream(const unsigned int streamNum)
void AdvanceStream(const unsigned streamNum)
{
assert(streamNum >= 0 && streamNum < m_streams.size());
assert(streamNum < m_streams.size());
if (m_eof_reached)
return;
@@ -203,8 +203,8 @@ class ProcessorXChunks::ProcessorXChunksImpl
m_initialized_streams = true;
m_vanilla_buffer_offset = static_cast<size_t>(m_base->m_base_stream->Pos());
const unsigned int streamCount = m_streams.size();
for (unsigned int streamNum = 0; streamNum < streamCount; streamNum++)
const auto streamCount = static_cast<unsigned>(m_streams.size());
for (auto streamNum = 0u; streamNum < streamCount; streamNum++)
{
AdvanceStream(streamNum);
}
@@ -214,7 +214,7 @@ class ProcessorXChunks::ProcessorXChunksImpl
m_streams[0]->GetOutput(&m_current_chunk, &m_current_chunk_size);
}
bool EndOfStream() const
[[nodiscard]] bool EndOfStream() const
{
return m_eof_reached && m_eof_stream == m_current_stream;
}