From eeb81b7223c003b40d1dc2267555a815d08f8967 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 30 May 2024 16:02:58 -0400 Subject: [PATCH] Use USHRT_MAX instead of MAXWORD (#975) --- .../src/common/legoactioncontrolpresenter.cpp | 6 +++--- .../legoomni/src/common/legoanimmmpresenter.cpp | 6 +++--- .../legoomni/src/common/mxcontrolpresenter.cpp | 6 +++--- .../legoomni/src/control/legometerpresenter.cpp | 6 +++--- .../legoomni/src/entity/legoactorpresenter.cpp | 6 +++--- .../legoomni/src/entity/legoentitypresenter.cpp | 6 +++--- .../legoomni/src/entity/legoworldpresenter.cpp | 6 +++--- .../legoomni/src/paths/legopathpresenter.cpp | 6 +++--- .../legoomni/src/video/legoanimpresenter.cpp | 12 ++++++------ .../legoomni/src/video/legomodelpresenter.cpp | 6 +++--- LEGO1/lego/sources/roi/legolod.cpp | 16 ++++++++-------- LEGO1/omni/src/audio/mxwavepresenter.cpp | 6 +++--- LEGO1/omni/src/common/mxpresenter.cpp | 12 ++++++------ LEGO1/omni/src/video/mxstillpresenter.cpp | 6 +++--- 14 files changed, 53 insertions(+), 53 deletions(-) diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp index 607a0595..69ca127f 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -77,10 +77,10 @@ void LegoActionControlPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strACTION, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp index b88392e5..d115e732 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp @@ -241,10 +241,10 @@ void LegoAnimMMPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strANIMMAN_ID, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp index 96e6d598..b1edc1e9 100644 --- a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp @@ -244,10 +244,10 @@ void MxControlPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[256]; if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp index c6c8352a..f0df5de9 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -40,10 +40,10 @@ void LegoMeterPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[256]; if (KeyValueStringParse(extraCopy, g_strTYPE, output)) { diff --git a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp index 40273e1c..40cfb958 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp @@ -34,10 +34,10 @@ void LegoActorPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; m_entity->ParseAction(extraCopy); } diff --git a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp index a755bb2f..70be36c4 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp @@ -96,10 +96,10 @@ void LegoEntityPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; m_entity->ParseAction(extraCopy); } diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index a4e5902b..cc64360f 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -429,10 +429,10 @@ void LegoWorldPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[1024]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[1024]; if (KeyValueStringParse(output, g_strWORLD, extraCopy)) { diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index f5cb137b..42366127 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -122,10 +122,10 @@ void LegoPathPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[256], output[256]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; strupr(extraCopy); diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index 9d126327..5f8662df 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -947,18 +947,18 @@ void LegoAnimPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[256]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[256]; if (KeyValueStringParse(NULL, g_strFROM_PARENT, extraCopy) && m_compositePresenter != NULL) { m_compositePresenter->GetAction()->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + if (extraLength & USHRT_MAX) { + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; } } diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 7395ccfc..ce448d71 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -296,11 +296,11 @@ void LegoModelPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[1024], output[1024]; output[0] = '\0'; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; if (KeyValueStringParse(output, g_strAUTO_CREATE, extraCopy) != 0) { char* token = strtok(output, g_parseExtraTokens); diff --git a/LEGO1/lego/sources/roi/legolod.cpp b/LEGO1/lego/sources/roi/legolod.cpp index 2170c101..c325c670 100644 --- a/LEGO1/lego/sources/roi/legolod.cpp +++ b/LEGO1/lego/sources/roi/legolod.cpp @@ -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, diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index bc6f0683..80e52dd1 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -331,10 +331,10 @@ void MxWavePresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char soundValue[512]; if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) { diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index 5d19f091..e599f568 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -87,10 +87,10 @@ void MxPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char worldValue[512]; if (KeyValueStringParse(worldValue, g_strWORLD, extraCopy)) { @@ -251,10 +251,10 @@ MxEntity* MxPresenter::CreateEntity(const char* p_defaultName) char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; KeyValueStringParse(objectName, g_strOBJECT, extraCopy); } diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index 53fb3b35..4cae0f26 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -202,10 +202,10 @@ void MxStillPresenter::ParseExtra() char* extraData; m_action->GetExtra(extraLength, extraData); - if (extraLength & MAXWORD) { + if (extraLength & USHRT_MAX) { char extraCopy[512]; - memcpy(extraCopy, extraData, extraLength & MAXWORD); - extraCopy[extraLength & MAXWORD] = '\0'; + memcpy(extraCopy, extraData, extraLength & USHRT_MAX); + extraCopy[extraLength & USHRT_MAX] = '\0'; char output[512]; if (KeyValueStringParse(output, g_strVISIBILITY, extraCopy)) {