TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04: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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
View File

@ -77,10 +77,10 @@ void LegoActionControlPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[1024]; char extraCopy[1024];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[1024]; char output[1024];
if (KeyValueStringParse(output, g_strACTION, extraCopy)) { if (KeyValueStringParse(output, g_strACTION, extraCopy)) {

6
LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
View File

@ -241,10 +241,10 @@ void LegoAnimMMPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[1024]; char extraCopy[1024];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[1024]; char output[1024];
if (KeyValueStringParse(output, g_strANIMMAN_ID, extraCopy)) { if (KeyValueStringParse(output, g_strANIMMAN_ID, extraCopy)) {

6
LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
View File

@ -244,10 +244,10 @@ void MxControlPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[256]; char extraCopy[256];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[256]; char output[256];
if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) { if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) {

6
LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
View File

@ -40,10 +40,10 @@ void LegoMeterPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[256]; char extraCopy[256];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[256]; char output[256];
if (KeyValueStringParse(extraCopy, g_strTYPE, output)) { if (KeyValueStringParse(extraCopy, g_strTYPE, output)) {

6
LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
View File

@ -34,10 +34,10 @@ void LegoActorPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
m_entity->ParseAction(extraCopy); m_entity->ParseAction(extraCopy);
} }

6
LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
View File

@ -96,10 +96,10 @@ void LegoEntityPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
m_entity->ParseAction(extraCopy); m_entity->ParseAction(extraCopy);
} }

6
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@ -429,10 +429,10 @@ void LegoWorldPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[1024]; char extraCopy[1024];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[1024]; char output[1024];
if (KeyValueStringParse(output, g_strWORLD, extraCopy)) { if (KeyValueStringParse(output, g_strWORLD, extraCopy)) {

6
LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
View File

@ -122,10 +122,10 @@ void LegoPathPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[256], output[256]; char extraCopy[256], output[256];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
strupr(extraCopy); strupr(extraCopy);

12
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@ -947,18 +947,18 @@ void LegoAnimPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[256]; char extraCopy[256];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[256]; char output[256];
if (KeyValueStringParse(NULL, g_strFROM_PARENT, extraCopy) && m_compositePresenter != NULL) { if (KeyValueStringParse(NULL, g_strFROM_PARENT, extraCopy) && m_compositePresenter != NULL) {
m_compositePresenter->GetAction()->GetExtra(extraLength, extraData); m_compositePresenter->GetAction()->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
} }
} }

6
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@ -296,11 +296,11 @@ void LegoModelPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[1024], output[1024]; char extraCopy[1024], output[1024];
output[0] = '\0'; output[0] = '\0';
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
if (KeyValueStringParse(output, g_strAUTO_CREATE, extraCopy) != 0) { if (KeyValueStringParse(output, g_strAUTO_CREATE, extraCopy) != 0) {
char* token = strtok(output, g_parseExtraTokens); char* token = strtok(output, g_parseExtraTokens);

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

6
LEGO1/omni/src/audio/mxwavepresenter.cpp
View File

@ -331,10 +331,10 @@ void MxWavePresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char soundValue[512]; char soundValue[512];
if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) { if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) {

12
LEGO1/omni/src/common/mxpresenter.cpp
View File

@ -87,10 +87,10 @@ void MxPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char worldValue[512]; char worldValue[512];
if (KeyValueStringParse(worldValue, g_strWORLD, extraCopy)) { if (KeyValueStringParse(worldValue, g_strWORLD, extraCopy)) {
@ -251,10 +251,10 @@ MxEntity* MxPresenter::CreateEntity(const char* p_defaultName)
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
KeyValueStringParse(objectName, g_strOBJECT, extraCopy); KeyValueStringParse(objectName, g_strOBJECT, extraCopy);
} }

6
LEGO1/omni/src/video/mxstillpresenter.cpp
View File

@ -202,10 +202,10 @@ void MxStillPresenter::ParseExtra()
char* extraData; char* extraData;
m_action->GetExtra(extraLength, extraData); m_action->GetExtra(extraLength, extraData);
if (extraLength & MAXWORD) { if (extraLength & USHRT_MAX) {
char extraCopy[512]; char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & MAXWORD); memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & MAXWORD] = '\0'; extraCopy[extraLength & USHRT_MAX] = '\0';
char output[512]; char output[512];
if (KeyValueStringParse(output, g_strVISIBILITY, extraCopy)) { if (KeyValueStringParse(output, g_strVISIBILITY, extraCopy)) {