diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-28 00:34:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-27 21:34:18 -0800 |
| commit | 4fb3af91b8aff0b9042affa4d430aa3375199973 (patch) | |
| tree | 2b93dea8856e149b5145a2dcc9965df38081e5f7 /src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp | |
| parent | a089a1d21c641cab569facace79ec646132a6d34 (diff) | |
Various small matches (#2879)
* Misc debug matches
* Fix JASBasicWaveBank weak func order
* Remove more dol2asm stuff, fix missing includes
* Some data fixes
* Update comments
* d_file_sel_warning is already OK
* Fix Z2 splits
* Fix movebox namespace
* Fix inlining issue in m_Do_ext
* Fix Z2 splits for P and J
Diffstat (limited to 'src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp')
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index ddd7c61d12..c6601ec64e 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -150,7 +150,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i BOOL ind_flag = (i_flags & 0x1000000) ? TRUE : FALSE; if (i_material == NULL) { i_material = new J3DMaterial(); - JUT_ASSERT_MSG(269, i_material, "Error : allocate memory."); + J3D_ASSERT_ALLOCMEM(269, i_material); } i_material->mColorBlock = J3DMaterial::createColorBlock(color_flag); i_material->mTexGenBlock = J3DMaterial::createTexGenBlock(texgen_flag); @@ -252,14 +252,14 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material, u32 i_flags) const { if (i_material == NULL) { i_material = new J3DPatchedMaterial(); - JUT_ASSERT_MSG(430, i_material, "Error : allocate memory."); + J3D_ASSERT_ALLOCMEM(430, i_material); } bool bVar1 = i_flags & 0x3000000 ? true : false; i_material->mColorBlock = J3DMaterial::createColorBlock(0x40000000); i_material->mTexGenBlock = new J3DTexGenBlockPatched(); - JUT_ASSERT_MSG(440, i_material->mTexGenBlock, "Error : allocate memory."); + J3D_ASSERT_ALLOCMEM(440, i_material->mTexGenBlock); i_material->mTevBlock = new J3DTevBlockPatched(); - JUT_ASSERT_MSG(442, i_material->mTevBlock, "Error : allocate memory."); + J3D_ASSERT_ALLOCMEM(442, i_material->mTevBlock); i_material->mIndBlock = J3DMaterial::createIndBlock(bVar1); i_material->mPEBlock = J3DMaterial::createPEBlock(0x10000000, getMaterialMode(i_idx)); i_material->mIndex = i_idx; |