From eeb81b7223c003b40d1dc2267555a815d08f8967 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 30 May 2024 16:02:58 -0400 Subject: [PATCH 1/3] 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)) { From 3b3ac07cac2943c304481dfbad67614761f94463 Mon Sep 17 00:00:00 2001 From: DmitriLeon2000 Date: Fri, 31 May 2024 09:04:06 +0900 Subject: [PATCH 2/3] Rename LegoEdge::GetOpposingPoint to LegoEdge::CWVertex (#977) --- LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp | 2 +- LEGO1/lego/legoomni/src/paths/legopathactor.cpp | 8 ++++---- LEGO1/lego/legoomni/src/paths/legopathboundary.cpp | 6 +++--- LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp | 4 ++-- LEGO1/lego/sources/geom/legoedge.cpp | 2 +- LEGO1/lego/sources/geom/legoedge.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 39de0c7a..40afb7a3 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2451,7 +2451,7 @@ MxBool LegoAnimationManager::FUN_10063fb0(LegoLocation::Boundary* p_boundary, Le MxBool LegoAnimationManager::FUN_10064010(LegoPathBoundary* p_boundary, LegoUnknown100db7f4* p_edge, float p_destScale) { Mx3DPointFloat p1; - Vector3* v1 = p_edge->GetOpposingPoint(*p_boundary); + Vector3* v1 = p_edge->CWVertex(*p_boundary); Vector3* v2 = p_edge->CCWVertex(*p_boundary); p1 = *v2; diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp index 17d89e68..430914b2 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp @@ -94,9 +94,9 @@ MxResult LegoPathActor::VTable0x88( float p_destScale ) { - Vector3* v1 = p_srcEdge.GetOpposingPoint(*p_boundary); + Vector3* v1 = p_srcEdge.CWVertex(*p_boundary); Vector3* v2 = p_srcEdge.CCWVertex(*p_boundary); - Vector3* v3 = p_destEdge.GetOpposingPoint(*p_boundary); + Vector3* v3 = p_destEdge.CWVertex(*p_boundary); Vector3* v4 = p_destEdge.CCWVertex(*p_boundary); Mx3DPointFloat p1, p2, p3, p4, p5; @@ -171,7 +171,7 @@ MxResult LegoPathActor::VTable0x84( float p_destScale ) { - Vector3* v3 = p_destEdge.GetOpposingPoint(*p_boundary); + Vector3* v3 = p_destEdge.CWVertex(*p_boundary); Vector3* v4 = p_destEdge.CCWVertex(*p_boundary); Mx3DPointFloat p2, p3, p5; @@ -624,7 +624,7 @@ MxResult LegoPathActor::VTable0x9c() if (local20 != 0) { Mx3DPointFloat local78; - Vector3& v1 = *m_destEdge->GetOpposingPoint(*m_boundary); + Vector3& v1 = *m_destEdge->CWVertex(*m_boundary); Vector3& v2 = *m_destEdge->CCWVertex(*m_boundary); LERP3(local34, v1, v2, m_unk0xe4); diff --git a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp index 81108d61..bcd1875c 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp @@ -231,7 +231,7 @@ MxU32 LegoPathBoundary::Intersect( Mx3DPointFloat local50; Mx3DPointFloat local70; - Vector3* local5c = e->GetOpposingPoint(*this); + Vector3* local5c = e->CWVertex(*this); p_point3 = vec; p_point3.Mul(localc); @@ -256,7 +256,7 @@ MxU32 LegoPathBoundary::Intersect( break; } - Vector3* local90 = local88->GetOpposingPoint(*this); + Vector3* local90 = local88->CWVertex(*this); Mx3DPointFloat locala4(p_point3); ((Vector3&) locala4).Sub(local90); @@ -283,7 +283,7 @@ MxU32 LegoPathBoundary::Intersect( break; } - Vector3* localc4 = locala8->GetOpposingPoint(*this); + Vector3* localc4 = locala8->CWVertex(*this); Mx3DPointFloat locald8(p_point3); ((Vector3&) locald8).Sub(localc4); diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp index 3a5a763b..19fc04fd 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp @@ -756,9 +756,9 @@ MxS32 LegoPathController::FUN_1004a240( Mx3DPointFloat vec; p_v1 = *p_edge->CCWVertex(*p_boundary); - p_v1.Sub(p_edge->GetOpposingPoint(*p_boundary)); + p_v1.Sub(p_edge->CWVertex(*p_boundary)); p_v1.Mul(p_f1); - p_v1.Add(p_edge->GetOpposingPoint(*p_boundary)); + p_v1.Add(p_edge->CWVertex(*p_boundary)); p_edge->FUN_1002ddc0(*p_boundary, vec); p_v2.EqualsCross(p_boundary->GetUnknown0x14(), &vec); return 0; diff --git a/LEGO1/lego/sources/geom/legoedge.cpp b/LEGO1/lego/sources/geom/legoedge.cpp index 1788a0d7..7606d6a1 100644 --- a/LEGO1/lego/sources/geom/legoedge.cpp +++ b/LEGO1/lego/sources/geom/legoedge.cpp @@ -51,7 +51,7 @@ LegoEdge* LegoEdge::GetCounterclockwiseEdge(LegoWEEdge& p_face) } // FUNCTION: LEGO1 0x1009a510 -Vector3* LegoEdge::GetOpposingPoint(LegoWEEdge& p_face) +Vector3* LegoEdge::CWVertex(LegoWEEdge& p_face) { return &p_face == m_faceA ? m_pointB : m_pointA; } diff --git a/LEGO1/lego/sources/geom/legoedge.h b/LEGO1/lego/sources/geom/legoedge.h index 0f238c37..753d6e11 100644 --- a/LEGO1/lego/sources/geom/legoedge.h +++ b/LEGO1/lego/sources/geom/legoedge.h @@ -14,7 +14,7 @@ struct LegoEdge { LegoEdge* GetClockwiseEdge(LegoWEEdge& p_face); LegoEdge* GetCounterclockwiseEdge(LegoWEEdge& p_face); - Vector3* GetOpposingPoint(LegoWEEdge& p_face); + Vector3* CWVertex(LegoWEEdge& p_face); Vector3* CCWVertex(LegoWEEdge& p_face); LegoResult FUN_1002ddc0(LegoWEEdge& p_face, Vector3& p_point); From 77af1a5483780db06f09558d248a4766763c8701 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 31 May 2024 17:15:35 -0400 Subject: [PATCH 3/3] Fix Radio::HandleControl COMPAT_MODE branch (#978) --- LEGO1/lego/legoomni/src/actors/radio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/lego/legoomni/src/actors/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp index f625e787..e78e7ba8 100644 --- a/LEGO1/lego/legoomni/src/actors/radio.cpp +++ b/LEGO1/lego/legoomni/src/actors/radio.cpp @@ -111,7 +111,7 @@ MxLong Radio::HandleControl(LegoControlManagerEvent& p_param) if (CurrentWorld()) { #ifdef COMPAT_MODE - MxNotificationParam param(c_notificationEndAction, this); + MxNotificationParam param(c_notificationType0, this); CurrentWorld()->Notify(param); #else CurrentWorld()->Notify(MxNotificationParam(c_notificationType0, this));