mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use USHRT_MAX instead of MAXWORD (#975)

Browse Source
This commit is contained in:
Christian Semmler
2024-05-30 16:02:58 -04:00
committed by GitHub
parent 76435d803f
commit eeb81b7223
14 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/lego/sources/roi/legolod.cpp
View File

@@ -137,14 +137,14 @@ LegoResult LegoLOD::Read(Tgl::Renderer* p_renderer, LegoTextureContainer* p_text
goto done;
}
m_numPolys += numPolys & MAXWORD;
m_numPolys += numPolys & USHRT_MAX;
if (p_storage->Read(&numVertices, 2) != SUCCESS) {
goto done;
}
polyIndices = new LegoU32[numPolys & MAXWORD][sizeOfArray(*polyIndices)];
if (p_storage->Read(polyIndices, (numPolys & MAXWORD) * sizeof(*polyIndices)) != SUCCESS) {
polyIndices = new LegoU32[numPolys & USHRT_MAX][sizeOfArray(*polyIndices)];
if (p_storage->Read(polyIndices, (numPolys & USHRT_MAX) * sizeof(*polyIndices)) != SUCCESS) {
goto done;
}
@@ -153,8 +153,8 @@ LegoResult LegoLOD::Read(Tgl::Renderer* p_renderer, LegoTextureContainer* p_text
}
if (numTextureIndices > 0) {
textureIndices = new LegoU32[numPolys & MAXWORD][sizeOfArray(*textureIndices)];
if (p_storage->Read(textureIndices, (numPolys & MAXWORD) * sizeof(*textureIndices)) != SUCCESS) {
textureIndices = new LegoU32[numPolys & USHRT_MAX][sizeOfArray(*textureIndices)];
if (p_storage->Read(textureIndices, (numPolys & USHRT_MAX) * sizeof(*textureIndices)) != SUCCESS) {
goto done;
}
}
@@ -179,7 +179,7 @@ LegoResult LegoLOD::Read(Tgl::Renderer* p_renderer, LegoTextureContainer* p_text
shadingModel = Tgl::Gouraud;
}
m_numVertices += numVertices & MAXWORD;
m_numVertices += numVertices & USHRT_MAX;
textureName = mesh->GetTextureName();
materialName = mesh->GetMaterialName();
@@ -194,8 +194,8 @@ LegoResult LegoLOD::Read(Tgl::Renderer* p_renderer, LegoTextureContainer* p_text
}
m_melems[meshIndex].m_tglMesh = m_meshBuilder->CreateMesh(
numPolys & MAXWORD,
numVertices & MAXWORD,
numPolys & USHRT_MAX,
numVertices & USHRT_MAX,
vertices,
normals,
textureVertices,