mirror of
https://github.com/isledecomp/isle.git
synced 2025-04-21 11:00:52 -04:00
Use USHRT_MAX instead of MAXWORD (#975)
This commit is contained in:
parent
76435d803f
commit
eeb81b7223
14 changed files with 53 additions and 53 deletions
LEGO1
lego
legoomni/src
common
control
entity
paths
video
sources/roi
omni/src
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue