zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-04 02:01:51 +00:00
Code Activity

refactor: fix x64 compilation for ObjLoading

Browse Source
This commit is contained in:
Jan
2025-04-26 10:11:28 +01:00
committed by Jan Laupetin
parent ee4301952a
commit 5d0c94e430
34 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserState.cpp
View File

@ -26,14 +26,14 @@ namespace
if (!maybeObjContainer)
return;
maybeObjContainer->m_asset_end = zoneDefinition.m_assets.size();
maybeObjContainer->m_asset_end = static_cast<unsigned>(zoneDefinition.m_assets.size());
zoneDefinition.m_obj_containers.emplace_back(std::move(*maybeObjContainer));
maybeObjContainer = std::nullopt;
}
ZoneDefinitionObjContainer DefineNewObjContainer(const ZoneDefinition& zoneDefinition, std::string name, const ZoneDefinitionObjContainerType type)
{
return ZoneDefinitionObjContainer(std::move(name), type, zoneDefinition.m_assets.size());
return ZoneDefinitionObjContainer(std::move(name), type, static_cast<unsigned>(zoneDefinition.m_assets.size()));
}
void SortObjContainer(ZoneDefinition& zoneDefinition)

4
src/ZoneCommon/Zone/XChunk/XChunkProcessorDeflate.cpp
View File

@ -17,9 +17,9 @@ size_t XChunkProcessorDeflate::Process(int streamNumber, const uint8_t* input, c
if (ret != Z_OK)
throw XChunkException("Initializing deflate failed.");
stream.avail_in = inputLength;
stream.avail_in = static_cast<unsigned>(inputLength);
stream.next_in = input;
stream.avail_out = outputBufferSize;
stream.avail_out = static_cast<unsigned>(outputBufferSize);
stream.next_out = output;
ret = deflate(&stream, Z_FINISH);

4
src/ZoneCommon/Zone/XChunk/XChunkProcessorInflate.cpp
View File

@ -16,9 +16,9 @@ size_t XChunkProcessorInflate::Process(int streamNumber, const uint8_t* input, c
if (ret != Z_OK)
throw XChunkException("Initializing inflate failed.");
stream.avail_in = inputLength;
stream.avail_in = static_cast<unsigned>(inputLength);
stream.next_in = input;
stream.avail_out = outputBufferSize;
stream.avail_out = static_cast<unsigned>(outputBufferSize);
stream.next_out = output;
ret = inflate(&stream, Z_FULL_FLUSH);