summaryrefslogtreecommitdiff
path: root/src/m_Do/m_Do_ext.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-10-17 21:35:18 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-10-17 21:35:18 -0400
commit34afbd84db8d66dd634fa19e94a737d40dfe7995 (patch)
treefb950a75f3928b8283874b277a9ab9baf1345392 /src/m_Do/m_Do_ext.cpp
parentf1d73f7fc721e957303d4e6541ec165c3ad9aea5 (diff)
clangd: Started fixing warnings and errors, code cleanup
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
-rw-r--r--src/m_Do/m_Do_ext.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index d9e1fd77..b819da02 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -903,8 +903,8 @@ JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignmen
}
JKRSolidHeap* createdHeap;
- if (i_size == 0 || i_size == 0xFFFFFFFF) {
- createdHeap = JKRSolidHeap::create(0xFFFFFFFFFF, i_heap, false);
+ if (i_size == 0 || i_size == -1) {
+ createdHeap = JKRSolidHeap::create(-1, i_heap, false);
} else {
i_size = ALIGN_NEXT(i_size, 0x10);
i_size += 0x80;
@@ -1164,7 +1164,7 @@ mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_
return;
}
if (modelData->getModelDataType() == 1 && modelFlag == 0) {
- if (modelFlag = modelData->isLocked()) {
+ if (modelData->isLocked()) {
modelFlag = 0x20000;
} else {
modelFlag = 0x80000;
@@ -1451,7 +1451,7 @@ mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData* modelData, mDoExt_McaMorfCallBack
return;
}
if (modelData->getModelDataType() == 1 && modelFlag == 0) {
- if (modelFlag = modelData->isLocked()) {
+ if (modelData->isLocked()) {
modelFlag = 0x20000;
} else {
modelFlag = 0x80000;
@@ -2587,7 +2587,7 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
J3DModel* model = new J3DModel();
if (model) {
if (i_modelData->getModelDataType() == 1 && i_modelFlag == 0) {
- if (i_modelFlag = i_modelData->isLocked()) {
+ if (i_modelData->isLocked()) {
i_modelFlag = 0x20000;
} else {
i_modelFlag = 0x80000;