diff options
| author | Pheenoh <pheenoh@gmail.com> | 2023-08-20 22:10:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 22:10:09 -0600 |
| commit | 2d5c38e02293c040a96a87acd217f4594566a35c (patch) | |
| tree | f4717578ae7823cd029c3a2f78d596f2c437bad2 /src/m_Do/m_Do_ext.cpp | |
| parent | cf0b47a5baae8c9e9ccfda6872711823adba14c5 (diff) | |
d_a_obj_carry work, setup static shape data (#1890)
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7946946c36..5b104ec892 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -3561,7 +3561,7 @@ asm void mDoExt_removeSubFont() { /* 80014C54-80014D5C 00F594 0108+00 3/3 14/14 445/445 .text * mDoExt_J3DModel__create__FP12J3DModelDataUlUl */ -J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 modelFlag, u32 differedDlistFlag) { +J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag) { if (i_modelData != NULL) { J3DModel* model = new J3DModel(); @@ -3569,18 +3569,18 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 modelFlag, u32 // Update the modelFlag if the model data passed in has a shared dlist object if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL) { if (i_modelData->isLocked()) { - modelFlag = J3DMdlFlag_Unk20000; - } else if (modelFlag == J3DMdlFlag_Unk20000) { - modelFlag |= J3DMdlFlag_Unk40000; + i_modelFlag = J3DMdlFlag_Unk20000; + } else if (i_modelFlag == J3DMdlFlag_Unk20000) { + i_modelFlag |= J3DMdlFlag_Unk40000; } else { - modelFlag = J3DMdlFlag_Unk80000; + i_modelFlag = J3DMdlFlag_Unk80000; } } // Set up the model - if (!model->entryModelData(i_modelData, modelFlag, 1)) { - if (modelFlag == J3DMdlFlag_Unk80000 && - model->newDifferedDisplayList(differedDlistFlag)) + if (!model->entryModelData(i_modelData, i_modelFlag, 1)) { + if (i_modelFlag == J3DMdlFlag_Unk80000 && + model->newDifferedDisplayList(i_differedDlistFlag)) { return NULL; } |