mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +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

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

@@ -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)) {

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

@@ -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);
}

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

@@ -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)) {