diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-31 22:11:01 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-31 22:11:01 -0400 |
| commit | 207f6e911f4a5074dc0fb72315d889b57a9c97f6 (patch) | |
| tree | be6f99ede8bd375caf734d7aec18304c9de07d5e /src | |
| parent | 85c97022df04e351477f759fef3a9bd49710b5c8 (diff) | |
Add default arguments to anm init functions to simplify calls
Diffstat (limited to 'src')
94 files changed, 210 insertions, 207 deletions
diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index 2f63135d..ded086cd 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -77,7 +77,7 @@ BOOL daAleaf_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BCK_VIGAH); JUT_ASSERT(DEMO_SELECT(273, 277), pbck != NULL); - if (!unk_408.init(modelData, pbck, 1, 1, 1.0f, 0, -1, 0)) { + if (!unk_408.init(modelData, pbck, true, J3DFrameCtrl::EMode_RESET)) { return FALSE; } diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index f69224a7..9fbbfcc8 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1757,7 +1757,7 @@ BOOL daAgb_c::createHeap() { } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", AGB_BRK_AGBCURSOR); - if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 1)) { + if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, TRUE)) { return FALSE; } diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 9c21ea63..e35e6880 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1212,14 +1212,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { a_this->mpBtkAnm = new mDoExt_btkAnm(); if (!a_this->mpBtkAnm) { return FALSE; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", AM2_BTK_AM2); - int ret = a_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int ret = a_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } if (!a_this->mpBtkAnm) { return FALSE; } a_this->mpBrkAnm = new mDoExt_brkAnm(); if (!a_this->mpBrkAnm) { return FALSE; } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", AM2_BRK_AM2); - ret = a_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + ret = a_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } if (!a_this->mpBrkAnm) { return FALSE; } diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 8325b77b..5230d547 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -41,7 +41,7 @@ BOOL daArrow_Iceeff_c::CreateHeap() { J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", LINK_BCK_GICER01)); JUT_ASSERT(107, bck != NULL); - if(!mBck.init(modelData, bck, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if(!mBck.init(modelData, bck, true, J3DFrameCtrl::EMode_NONE)) { return false; } } diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 7a11e48c..2ebf21a9 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -116,10 +116,10 @@ BOOL daArrow_Lighteff_c::CreateHeap() { JUT_ASSERT(216, btk != NULL); JUT_ASSERT(217, brk != NULL); - if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } - if(!mBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if(!mBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE)) { return false; } diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index b5c96ac2..356e6c2c 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -2557,7 +2557,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) { J3DAnmTexPattern* btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Bb", bb_tex_anm_idx[4])); JUT_ASSERT(DEMO_SELECT(4529, 4556), btp); - s32 ret = i_this->mBtpAnm.init(i_this->mpMorf->getModel()->getModelData(), btp, 0, 2, 1.0f, 0, -1, false, 0); + s32 ret = i_this->mBtpAnm.init(i_this->mpMorf->getModel()->getModelData(), btp, 0, J3DFrameCtrl::EMode_LOOP); if (ret == 0) { return FALSE; } diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 181bc44b..e53cde16 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -3608,7 +3608,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->bva = new mDoExt_bvaAnm(); JUT_ASSERT(0x1864, i_this->bva); - s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull *)dComIfG_getObjectRes("Bdk", BDK_BVA_HIBIWARE1), 1, 0, 1.0f, 0, -1, FALSE, 0); + s32 bva = i_this->bva->init(i_this->mp8F0, (J3DAnmVisibilityFull *)dComIfG_getObjectRes("Bdk", BDK_BVA_HIBIWARE1), 1, J3DFrameCtrl::EMode_NONE); if (bva == 0) { return FALSE; } diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 70361f98..f0496555 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -143,9 +143,9 @@ BOOL daBeam_c::CreateHeap() { M_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, YLESR00_INDEX_BTK_YLESR00)); JUT_ASSERT(318, M_brk != NULL); - BOOL tmp1 = mBckAnm.init(modelData, M_bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); - BOOL tmp2 = mBrkAnm.init(modelData, M_brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE); - BOOL tmp3 = mBtkAnm.init(modelData, M_btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE); + BOOL tmp1 = mBckAnm.init(modelData, M_bck, false, J3DFrameCtrl::EMode_LOOP); + BOOL tmp2 = mBrkAnm.init(modelData, M_brk, false, J3DFrameCtrl::EMode_LOOP); + BOOL tmp3 = mBtkAnm.init(modelData, M_btk, true, J3DFrameCtrl::EMode_LOOP); if (M_mdl == NULL || !tmp1 || !tmp2 || !tmp3) { return false; diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index bb8b1007..73c0bd26 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -129,7 +129,7 @@ BOOL daBFlower_c::CreateHeap() { J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX)); JUT_ASSERT(0x1C3, pbck != NULL); - if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, false)) { + if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_RESET)) { return FALSE; } mBck1.setFrame(mBck1.getEndFrame()); @@ -137,7 +137,7 @@ BOOL daBFlower_c::CreateHeap() { J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX)); JUT_ASSERT(0x1D9, pbrk != NULL); - if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mBrk1.setPlaySpeed(0.0f); @@ -153,7 +153,7 @@ BOOL daBFlower_c::CreateHeap() { pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX)); JUT_ASSERT(0x1F7, pbck != NULL); - if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mBck2.setPlaySpeed(0.0f); @@ -161,7 +161,7 @@ BOOL daBFlower_c::CreateHeap() { pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX)); JUT_ASSERT(0x208, pbrk != NULL); - if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mBrk2.setPlaySpeed(0.0f); diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 06f4194d..f0f85d35 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -51,7 +51,7 @@ BOOL daBg_btkAnm_c::create(J3DModelData* modelData, J3DAnmTextureSRTKey* anmData if (anm == NULL) return FALSE; - if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP)) return FALSE; J3DAnmTextureSRTKey * data = anm->getBtkAnm(); @@ -92,7 +92,7 @@ BOOL daBg_brkAnm_c::create(J3DModelData* modelData, J3DAnmTevRegKey* anmData) { if (anm == NULL) return FALSE; - if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP)) return FALSE; J3DAnmTevRegKey * data = anm->getBrkAnm(); diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 7ecdc241..a076d978 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -188,7 +188,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) { if (i_this->mpBrkAnm == NULL) return FALSE; J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bita", ita_Ef[type]); - if (!i_this->mpBrkAnm->init(i_this->mpModelEf->getModelData(), brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!i_this->mpBrkAnm->init(i_this->mpModelEf->getModelData(), brk, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; i_this->mpBgW = new dBgW(); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index b9dd6782..f2a5de64 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -4553,7 +4553,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { return cPhs_ERROR_e; } J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI); - if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE)) { // Bug: Same as above. // TODO check this case as well. return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 4dd6a6a1..d9c5878e 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -1726,7 +1726,7 @@ BOOL useHeapInit(bmd_class* i_this) { return FALSE; } pJVar5 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bmd", BMD_BRK_BKM); - iVar6 = i_this->mpBrkAnm->init(pJVar13->getModelData(), pJVar5, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar6 = i_this->mpBrkAnm->init(pJVar13->getModelData(), pJVar5, true, J3DFrameCtrl::EMode_NONE); if (iVar6 == 0) { return FALSE; } @@ -1735,7 +1735,7 @@ BOOL useHeapInit(bmd_class* i_this) { return FALSE; } pAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmd", BMD_BTK_BKM); - iVar6 = i_this->mpBtkAnm->init(pJVar13->getModelData(), pAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar6 = i_this->mpBtkAnm->init(pJVar13->getModelData(), pAnm, true, J3DFrameCtrl::EMode_NONE); if (iVar6 == 0) { return FALSE; } diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 68270249..0090719e 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -744,7 +744,7 @@ s32 useHeapInit(bmdfoot_class* i_this) { i_this->btk = pmVar5; JUT_ASSERT(DEMO_SELECT(1416, 1426), i_this->btk); pAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bmdfoot", BMDFOOT_BTK_ASI); - iVar7 = i_this->btk->init(pJVar9->getModelData(), pAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar7 = i_this->btk->init(pJVar9->getModelData(), pAnm, true, J3DFrameCtrl::EMode_NONE); #if VERSION > VERSION_DEMO if (iVar7 == 0) { return FALSE; diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 5e1ecae1..9d90381f 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -868,7 +868,7 @@ BOOL daBoko_c::createHeap() { !mBrkAnm.init( modelData, static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1)), - true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + true, J3DFrameCtrl::EMode_NONE )) { return FALSE; diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index c1757ea2..da4170d4 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -271,11 +271,11 @@ namespace daBomb2 { J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM)); JUT_ASSERT(0x30D, bck_data != NULL); - int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::EMode_NONE); J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM)); JUT_ASSERT(0x314, brk_data != NULL); - int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE); return mpModel && temp && temp3; } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index b71e333f..86fbc9bf 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1324,19 +1324,19 @@ BOOL daBomb_c::createHeap() { J3DAnmTransform* bck0_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX)); JUT_ASSERT(DEMO_SELECT(2425, 2478), bck0_data != NULL); - int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::EMode_NONE); J3DAnmTransform* bck1_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM)); JUT_ASSERT(DEMO_SELECT(2431, 2484), bck1_data != NULL); - int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::EMode_NONE); J3DAnmTevRegKey* brk0_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX)); JUT_ASSERT(DEMO_SELECT(2438, 2491), brk0_data != NULL); - int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::EMode_NONE); J3DAnmTevRegKey* brk1_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM)); JUT_ASSERT(DEMO_SELECT(2444, 2497), brk1_data != NULL); - int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::EMode_NONE); return mpModel && temp && temp2 && temp3 && temp4; } @@ -1350,7 +1350,7 @@ BOOL daBomb_c::createHeap() { } else { J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BCK_BOMB); - int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::EMode_LOOP); return temp ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 5a0995f0..8dec0a62 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -4038,7 +4038,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar2 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIRARU1); - if (!i_this->mBrkAnim->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->mBrkAnim->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } pmVar4 = new mDoExt_brkAnm(); @@ -4047,7 +4047,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar2 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_HIT); - if (!i_this->m2C4->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!i_this->m2C4->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } pmVar4 = new mDoExt_brkAnm(); @@ -4056,7 +4056,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar2 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_S1); - if (!i_this->m2C8->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->m2C8->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } pmVar4 = new mDoExt_brkAnm(); @@ -4065,7 +4065,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar2 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_NOROI_E1); - if (!i_this->m2CC->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->m2CC->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } pmVar4 = new mDoExt_brkAnm(); @@ -4074,7 +4074,7 @@ static BOOL boss_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar2 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_DEFAULT); - if (!i_this->m2D0->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!i_this->m2D0->init(pJVar1->getModelData(), pJVar2, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } if (!i_this->mD78.create(i_this->mpAnim->getModel())) { @@ -4191,7 +4191,7 @@ static BOOL kantera_useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar3 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("BPW", BPW_BRK_BPW_KAN1); - if (!i_this->mKanteraAnim->init(pJVar1->getModelData(), pJVar3, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!i_this->mKanteraAnim->init(pJVar1->getModelData(), pJVar3, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } return TRUE; diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 78307aa0..635cb9c5 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -2798,7 +2798,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } J3DAnmTextureSRTKey* key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", set_btk_d[i_this->mBstPartType]); - s32 res = i_this->mpTexMtxAnimator->init(i_this->m02B8->getModel()->getModelData(), key, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE); + s32 res = i_this->mpTexMtxAnimator->init(i_this->m02B8->getModel()->getModelData(), key, TRUE, J3DFrameCtrl::EMode_NONE); if (res == 0) { return FALSE; } @@ -2839,7 +2839,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } res = i_this->m2FD4->init( - modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_HBSITA1), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE + modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bst", BST_BTK_HBSITA1), TRUE, J3DFrameCtrl::EMode_LOOP ); if (res == 0) { return FALSE; @@ -2898,7 +2898,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } res = i_this->mpBrkAnm->init( - modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", set_za_brk_d[i_this->mBstPartType]), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bst", set_za_brk_d[i_this->mBstPartType]), TRUE, J3DFrameCtrl::EMode_NONE ); if (res == 0) { return FALSE; diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index edf7522e..3abf8af3 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -2620,14 +2620,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->btk = new mDoExt_btkAnm(); JUT_ASSERT(5370, i_this->btk); pJVar10 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_BTD); - iVar11 = i_this->btk->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + iVar11 = i_this->btk->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_LOOP); if (iVar11 == 0) { return FALSE; } i_this->brk = new mDoExt_brkAnm(); JUT_ASSERT(5390, i_this->brk); pJVar13 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_BTD); - iVar11 = i_this->brk->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + iVar11 = i_this->brk->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_LOOP); if (iVar11 == 0) { return FALSE; } @@ -2658,7 +2658,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->btkS = new mDoExt_btkAnm(); JUT_ASSERT(5432, i_this->btkS); pJVar10 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_DEADA); - iVar11 = i_this->btkS->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar11 = i_this->btkS->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_NONE); if (iVar11 == 0) { return FALSE; } @@ -2667,7 +2667,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { i_this->brkS = new mDoExt_brkAnm(); JUT_ASSERT(5463, i_this->brkS); pJVar13 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_DEADA); - iVar11 = i_this->brkS->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar11 = i_this->brkS->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_NONE); if (iVar11 == 0) { return FALSE; } @@ -2684,7 +2684,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar10 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Btd", BTD_BTK_NAMAKUBI); - iVar11 = i_this->m02D8->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar11 = i_this->m02D8->init(pJVar15->getModelData(), pJVar10, true, J3DFrameCtrl::EMode_NONE); if (iVar11 == 0) { return FALSE; } @@ -2693,7 +2693,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pJVar13 = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Btd", BTD_BRK_NAMAKUBI); - iVar11 = i_this->m02DC->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar11 = i_this->m02DC->init(pJVar15->getModelData(), pJVar13, true, J3DFrameCtrl::EMode_NONE); if (iVar11 == 0) { return FALSE; } diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 643112b4..99253326 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -2353,7 +2353,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } i_this->m0374[i] = new mDoExt_brkAnm(); iVar10 = - i_this->m0374[i]->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", fileIndex), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + i_this->m0374[i]->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", fileIndex), true, J3DFrameCtrl::EMode_NONE); if (iVar10 == 0) { return FALSE; } @@ -2395,7 +2395,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } iVar16 = i_this->m17F4[i]->init( - modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_START), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0 + modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", BWD_BTK_TAKI_START), true, J3DFrameCtrl::EMode_NONE ); if (iVar16 == 0) { return FALSE; @@ -2426,14 +2426,14 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } iVar10 = i_this->m3B2C[i]->init( - modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", s_btk[i]), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0 + modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", s_btk[i]), true, J3DFrameCtrl::EMode_NONE ); if (iVar10 == 0) { return FALSE; } i_this->m3B34[i] = new mDoExt_brkAnm(); iVar10 = - i_this->m3B34[i]->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", s_brk[i]), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + i_this->m3B34[i]->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", s_brk[i]), true, J3DFrameCtrl::EMode_NONE); if (iVar10 == 0) { return FALSE; } diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index 6d27bb97..2d8abe66 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -924,7 +924,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } int ret = i_this->mp18B8[i]->init( - modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", s_btk[i]), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0 + modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Bwd", s_btk[i]), TRUE, J3DFrameCtrl::EMode_LOOP ); if (!ret) { @@ -934,7 +934,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->mp18C0[i] = new mDoExt_brkAnm(); ret = i_this->mp18C0[i]->init( - modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", s_brk[i]), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0 + modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bwd", s_brk[i]), TRUE, J3DFrameCtrl::EMode_LOOP ); if (!ret) { diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 27c6a974..c3cd4e34 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -2418,7 +2418,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2B8->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2439,7 +2439,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2C8->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2451,7 +2451,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2CC->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2463,7 +2463,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2D0->init( - model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA01), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2475,7 +2475,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2D4->init( - model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("CC", CC_BTK_CC_IWA02), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; @@ -2496,7 +2496,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } if (!i_this->m2C0->init( - model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_BETA), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE + model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("CC", CC_BRK_CC_BETA), true, J3DFrameCtrl::EMode_NONE )) { return FALSE; diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 40310fd1..10d5c782 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -248,7 +248,7 @@ BOOL daStandItem_c::CreateHeap() { /* PRESIDENT_STATUE */ J3DFrameCtrl::EMode_LOOP, }; - if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, TRUE, playmode[mItemType], 1.0f, 0, -1, false)) + if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, TRUE, playmode[mItemType])) return FALSE; mpBckAnm->setPlaySpeed(0.0f); diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 2bcc1dab..b79a881a 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -291,17 +291,17 @@ BOOL daDaiocta_c::createAwaHeap() { } if (!mAwaBckAnms[i].init(modelData, bck, TRUE, - J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + J3DFrameCtrl::EMode_NONE)) { return FALSE; } if (!mAwaBtkAnms[i].init(modelData, btk, TRUE, - J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + J3DFrameCtrl::EMode_NONE)) { return FALSE; } if (!mAwaBrkAnms[i].init(modelData, brk, TRUE, - J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + J3DFrameCtrl::EMode_NONE)) { return FALSE; } } diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 5b5ca861..e6c457fe 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -73,14 +73,14 @@ BOOL daDekuItem_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK); JUT_ASSERT(0x103, pbck != NULL); - if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { + if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM); JUT_ASSERT(0x110, pbck != NULL); - if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index fef1b640..9ebd5dee 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -651,7 +651,10 @@ static BOOL daDr2_Delete(dr2_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* a_this) { dr2_class* i_this = (dr2_class*)a_this; - i_this->mpMorf1 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR_SIPPO), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); + i_this->mpMorf1 = new mDoExt_McaMorf( + (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR_SIPPO), + NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203 + ); if ((i_this->mpMorf1 == NULL) || (i_this->mpMorf1->getModel() == NULL)) { return FALSE; @@ -684,7 +687,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_GAN_MAGMA); - BOOL init = i_this->unk_420->init(i_this->unk_41C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + BOOL init = i_this->unk_420->init(i_this->unk_41C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE); #if VERSION > VERSION_DEMO if (!init) { return FALSE; @@ -731,7 +734,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO1); - if (!i_this->unk_430->init(i_this->unk_428->getModelData(), srtKey, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!i_this->unk_430->init(i_this->unk_428->getModelData(), srtKey, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -741,7 +744,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO2); - if (!i_this->unk_434->init(i_this->unk_42C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->unk_434->init(i_this->unk_42C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -751,7 +754,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { } J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", DR2_BRK_MBYO2); - if (!i_this->unk_438->init(i_this->unk_42C->getModelData(), tevRegKey, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!i_this->unk_438->init(i_this->unk_42C->getModelData(), tevRegKey, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index eb1710fc..3309a5f7 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -2699,7 +2699,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int brk2_res = i_this->mpBrkAnm2->init( - pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0 + pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1), TRUE, J3DFrameCtrl::EMode_NONE ); if (brk2_res == 0) return FALSE; @@ -2714,7 +2714,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int btk_res = i_this->mpBtkAnm->init( - pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKBL00), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, FALSE, 0 + pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKBL00), TRUE, J3DFrameCtrl::EMode_LOOP ); if (btk_res == 0) return FALSE; @@ -2724,7 +2724,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; int brk3_res = i_this->mpBrkAnm3->init( - pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKBL00), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0 + pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKBL00), TRUE, J3DFrameCtrl::EMode_NONE ); if (brk3_res == 0) return FALSE; diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index d777c254..9c202b4d 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -321,7 +321,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if(i_this->mpBtk == NULL) { return FALSE; } - if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKSP00), true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if(!i_this->mpBtk->init(pModelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKSP00), true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -329,7 +329,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { if(i_this->mpBrk == NULL) { return FALSE; } - if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKSP00), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if(!i_this->mpBrk->init(pModelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKSP00), true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } i_this->mpBrk->setFrame(6.999f); diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 43e3dc8f..d31b46d6 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -379,7 +379,7 @@ bool daFm_c::holeCreateHeap() { J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, FM_BTK_YPIT00)); JUT_ASSERT(0x2D0, btk != NULL); - if(!mBtkAnm.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if(!mBtkAnm.init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return false; } diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index ee2acd7d..abeb2856 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -44,7 +44,7 @@ BOOL daGhostship_c::_createHeap() { J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH)); JUT_ASSERT(DEMO_SELECT(87, 95), btk != NULL); - if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 958f7235..302400ba 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -70,7 +70,7 @@ BOOL daHys_c::CreateHeap() { J3DAnmTexPattern* pbtp = (J3DAnmTexPattern *)dComIfG_getObjectRes(m_arcname[mType], m_btpidx[mType]); JUT_ASSERT(0x114, pbtp != NULL); - if (!mBtpAnm.init(modelData, pbtp, FALSE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, FALSE)) { + if (!mBtpAnm.init(modelData, pbtp, FALSE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } field_0x458 = 0; diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 23125b67..d766a481 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -428,12 +428,12 @@ BOOL daIball_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START); JUT_ASSERT(1152, pbck != NULL); - int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::EMode_NONE); if (!ret) { return FALSE; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB); JUT_ASSERT(1164, pbtk != NULL); - ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } int brkIds[ARRAY_SIZE(mBrkAnm)] = { @@ -444,7 +444,7 @@ BOOL daIball_c::CreateHeap() { for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) { pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, brkIds[i]); JUT_ASSERT(1182, pbrk != NULL); - ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP); if (!ret) { return FALSE; } } diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 76230422..b08b6eda 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -62,7 +62,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm1); JUT_ASSERT(140, pbtk != NULL); mpBtkAnm1 = new mDoExt_btkAnm(); - if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } @@ -72,7 +72,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm2); JUT_ASSERT(156, pbtk != NULL); mpBtkAnm2 = new mDoExt_btkAnm(); - if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } @@ -88,7 +88,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, shouldAnimate = FALSE; } mpBrkAnm1 = new mDoExt_brkAnm(); - if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false)) { + if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } @@ -98,7 +98,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm2); JUT_ASSERT(197, pbrk != NULL); mpBrkAnm2 = new mDoExt_brkAnm(); - if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false)) { + if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } @@ -109,7 +109,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbck = (J3DAnmTransform*)dComIfG_getObjectRes(resName, bckAnm); JUT_ASSERT(212, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); - if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2, 1.0f, 0, -1, false)) { + if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2)) { return FALSE; } } diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 6942b0fb..1640a00e 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -303,7 +303,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - if (!i_this->mpBrkAnm1->init(modelData, anm_res_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (!i_this->mpBrkAnm1->init(modelData, anm_res_brk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } @@ -323,7 +323,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c* a_this) { return FALSE; } - if (!i_this->mpBrkAnm2->init(modelData, anm_res_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (!i_this->mpBrkAnm2->init(modelData, anm_res_brk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index a29019e9..6c4afdd6 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -1252,7 +1252,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } - if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", KI_BTK_FK), true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!i_this->m920->init(model->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Ki", KI_BTK_FK), true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index 6675dc5f..1c917675 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -36,14 +36,14 @@ BOOL daKmon_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BTK_VBELL)); JUT_ASSERT(176, pbtk != NULL); - if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } mBtkAnm.setPlaySpeed(1.0); J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(daKmon_c::m_arcname, ALWAYS_BCK_VBELL)); JUT_ASSERT(188, pbck != NULL); - if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { + if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } mBckAnm.setPlaySpeed(0.0); diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index f910c44c..9e1c6ff2 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -54,7 +54,7 @@ BOOL daKnob00_c::CreateHeap() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, KNOB_BCK_DOOROPENADOOR); - if (!mBckAnm.init(modelData, anmTransform, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if (!mBckAnm.init(modelData, anmTransform, true, J3DFrameCtrl::EMode_NONE)) { #if VERSION == VERSION_DEMO return cPhs_ERROR_e; #else diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index d5efd692..87903e45 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -35,7 +35,7 @@ bool daKomore::Act_c::create_heap() { JUT_ASSERT(0x6d, btk_data != NULL); s32 btkRet = - mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::EMode_LOOP); bool ret = FALSE; if (mdl_data != NULL && this->mpModel != NULL && btkRet != NULL) { diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index e06f33b8..fe494144 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -1398,7 +1398,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { if (i_this->mpBodyBrkAnm == NULL) return FALSE; - if (i_this->mpBodyBrkAnm->init(mpBodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0) == 0) + if (i_this->mpBodyBrkAnm->init(mpBodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; @@ -1414,14 +1414,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { if (i_this->mpEyeBtkAnm == NULL) return FALSE; - if (i_this->mpEyeBtkAnm->init(mpEyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0) == 0) + if (i_this->mpEyeBtkAnm->init(mpEyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; i_this->mpEyeBrkAnm = new mDoExt_brkAnm(); if (i_this->mpEyeBrkAnm == NULL) return FALSE; - if (i_this->mpEyeBrkAnm->init(mpEyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0) == 0) { + if (i_this->mpEyeBrkAnm->init(mpEyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } return TRUE; diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 592f432a..d650daab 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -31,14 +31,14 @@ BOOL daLbridge_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00); JUT_ASSERT(DEMO_SELECT(231, 232), pbtk != NULL); - if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00); JUT_ASSERT(DEMO_SELECT(245, 246), pbpk != NULL); - if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -48,7 +48,7 @@ BOOL daLbridge_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00); JUT_ASSERT(DEMO_SELECT(261, 262), pbrk != NULL); - if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 4159c6ca..5f78eef4 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -131,8 +131,8 @@ BOOL daMozo_c::CreateHeap() { m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ); JUT_ASSERT(0x16D, m_btk != NULL); - int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); - int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE); + int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::EMode_NONE); return mdlData != 0 && mAnimMorf != 0 && mAnimMorf->getModel() != 0 && brkInitResult != 0 && btkInitResult != 0; } diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index aecce1ec..5bd93250 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -455,7 +455,7 @@ BOOL daNpc_Cb1_c::createHeap() { mpPropellerModel->setUserArea((u32)this); - if(!mPropellerBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_M_OPEN), FALSE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if(!mPropellerBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_M_OPEN), FALSE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -466,7 +466,7 @@ BOOL daNpc_Cb1_c::createHeap() { return FALSE; } - if(!mNutBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_NUT_SOW), TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if(!mNutBckAnim.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes("Cb", CB_BCK_NUT_SOW), TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index bcf9684a..c612b774 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -4605,8 +4605,8 @@ BOOL daNpc_Ji1_c::CreateHeap() { J3DAnmTextureSRTKey* a_btk = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00)); JUT_ASSERT(0x15D0, a_btk != NULL); - int temp1 = mCryBrk.init(modelData2, a_brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); - int temp2 = mCryBtk.init(modelData2, a_btk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int temp1 = mCryBrk.init(modelData2, a_brk, false, J3DFrameCtrl::EMode_LOOP); + int temp2 = mCryBtk.init(modelData2, a_btk, false, J3DFrameCtrl::EMode_LOOP); if(mpTearsModel == 0 || temp1 == 0 || temp2 == 0) { return false; @@ -4615,7 +4615,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { headTexPattern = (J3DAnmTexPattern*)(dComIfG_getObjectRes("Ji", JI_BTP_JI)); JUT_ASSERT(0x15D8, headTexPattern != NULL); - temp2 = mBlinkAnim.init(modelData2, headTexPattern, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + temp2 = mBlinkAnim.init(modelData2, headTexPattern, TRUE, J3DFrameCtrl::EMode_LOOP); #if VERSION > VERSION_DEMO if(temp2 == 0) { return false; diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index fefa60b7..cb6b6973 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -36,7 +36,7 @@ bool daObjAjavW_c::create_heap() { ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); - s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP); mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, AJAVW_DZB_AJAVW), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (!mpModel || !btkRet || !mpBgW) diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 114ac4f8..5d8b8fb7 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -35,11 +35,11 @@ BOOL daObjYboil_c::CreateHeap() { if (mModel[i] == NULL) return FALSE; - if (!mBckAnm[i].init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBckAnm[i].init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; - if (!mBtkAnm[i].init(modelData, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm[i].init(modelData, btk, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; - if (!mBrkAnm[i].init(modelData, brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mBrkAnm[i].init(modelData, brk, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; } diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index a9e00d65..bf547d8b 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -53,8 +53,8 @@ bool daObjYgush00_c::create_heap() { ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); - s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); - s32 bckRet = mBckAnm.init(pModelData, pBck, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP); + s32 bckRet = mBckAnm.init(pModelData, pBck, 1, J3DFrameCtrl::EMode_LOOP); if (!mpModel || !btkRet || !bckRet) ret = false; diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index b73a37a8..5a5d693f 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -807,7 +807,7 @@ BOOL daObjApzl_c::CreateHeap() { return FALSE; } - if(mScoreboardBtpAnm[i].init(modelData, btp_data, 1, 0, 1.0f, 0, -1, false, FALSE) == 0) { + if(mScoreboardBtpAnm[i].init(modelData, btp_data, 1, 0) == 0) { return FALSE; } diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index ff9b79db..feddad92 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -202,7 +202,7 @@ bool daObjBarrel2::Act_c::create_heap() { s32 iVar5 = 0; if (m29C != NULL) { - iVar5 = m29C->init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + iVar5 = m29C->init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE); } if (m298 != NULL && iVar5 != 0) { diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index ab9a8a29..385e2cae 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -111,9 +111,9 @@ bool daObjBarrier_anm_c::init() { } else { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x1000200); BOOL btk_init = - mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP); BOOL brk_init = - mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP); if (mpModel == NULL || !btk_init || !brk_init) { rt = false; diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index d636d5c9..86b1afca 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -30,7 +30,7 @@ BOOL daObjDmgroom_c::CreateHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM)); JUT_ASSERT(0x5c, brk != NULL); - if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 1e056e12..acdbbb1e 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -111,7 +111,7 @@ BOOL daObjDoguu_c::CreateHeap() { J3DAnmTevRegKey* brk_doguu = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes("Doguu", daObjDoguu_idx_table.brk[field_0x894])); JUT_ASSERT(0x170, brk_doguu != NULL); - if (mBrk.init(modelData, brk_doguu, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { + if (mBrk.init(modelData, brk_doguu, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } @@ -126,7 +126,7 @@ BOOL daObjDoguu_c::CreateHeap() { J3DAnmTransform* bck_head = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Doguu", daObjDoguu_idx_table.bck[field_0x894])); JUT_ASSERT(0x17D, bck_head != NULL); - if (mBckHead.init(modelData, bck_head, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + if (mBckHead.init(modelData, bck_head, true, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } @@ -161,7 +161,7 @@ BOOL daObjDoguu_c::CreateHeap() { J3DAnmTransform* bck_body = static_cast<J3DAnmTransform *>(dComIfG_getObjectRes("Doguu", DOGUU_BCK_VGSBA)); JUT_ASSERT(0x1AB, bck_body != NULL); - if (mBckBody.init(modelData, bck_body, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + if (mBckBody.init(modelData, bck_body, true, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } @@ -184,7 +184,7 @@ BOOL daObjDoguu_c::CreateHeap() { J3DAnmTransform* bck_crystal = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Doguu", DOGUU_BCK_VGSPA)); JUT_ASSERT(0x1c3, bck_crystal != NULL); - if(mBckCrystal.init(modelData, bck_crystal, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0){ + if(mBckCrystal.init(modelData, bck_crystal, true, J3DFrameCtrl::EMode_NONE) == 0){ return FALSE; } diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 69f983be..134e6505 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -482,7 +482,7 @@ BOOL daObjFigure_c::createHeap() { return false; } - if(!mpBrkAnm->init(pModelData, pBrkData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if(!mpBrkAnm->init(pModelData, pBrkData, true, J3DFrameCtrl::EMode_LOOP)) { return false; } } @@ -534,7 +534,7 @@ BOOL daObjFigure_c::createHeap() { return false; } - if(!mBtpAnm1.init(pPedestalData, mpPedestalBtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if(!mBtpAnm1.init(pPedestalData, mpPedestalBtp, TRUE, J3DFrameCtrl::EMode_LOOP)) { return false; } diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 6ea9d72d..fec82cd5 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -28,7 +28,7 @@ BOOL daObjGnnbtaki_c::create_heap() { if (mpModel != NULL) { btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, GNNBTLTAKI_BTK_GNN_BTL_TAKI)); JUT_ASSERT(97, btk_data != NULL); - if (btk_data != NULL && mBtkAnm.init(mdl_data, btk_data, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0, 0, -1, false, FALSE)) { + if (btk_data != NULL && mBtkAnm.init(mdl_data, btk_data, TRUE, J3DFrameCtrl::EMode_LOOP)) { ret = TRUE; } } diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index 57bdb37b..02ba33c4 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -28,7 +28,7 @@ BOOL daObjGnntakie_c::create_heap() { if (mpModel != NULL) { btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIE_BTK_GNN_DEMO_TAKI_E)); JUT_ASSERT(97, btk_data != NULL); - if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, true, J3DFrameCtrl::EMode_LOOP)) { ret = TRUE; } } diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index 0d8f45a8..c39254af 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -205,11 +205,11 @@ BOOL daObjHhaYgush_c::create_area(const char* arcname) { J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(arcname, HHA_BTK_YGSTP00)); JUT_ASSERT(DEMO_SELECT(593, 656), btk_data != NULL); - if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false) != false){ + if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP) != false){ J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(arcname, HHA_BCK_YGSTP00)); JUT_ASSERT(DEMO_SELECT(598, 661), bck_data != NULL); - if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) != false){ + if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP) != false){ ret = TRUE; } } @@ -283,7 +283,7 @@ BOOL daObjHha_c::create_heap() { for(i = 0; i < 2; i++){ J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, l_daObjHha_btk_idx_table[i])); JUT_ASSERT(0x32f, btk_data != NULL); - if(mBtkA[i].init(mdl_data, btk_data, true, l_daObjHha_btk_mode_table[i], 1.0f, 0, -1, false, false) == FALSE){ + if(mBtkA[i].init(mdl_data, btk_data, true, l_daObjHha_btk_mode_table[i]) == FALSE){ ret = FALSE; break; } diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 7af5c0db..ef496b78 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -26,15 +26,15 @@ BOOL daObjIceisland_c::CreateHeap() { J3DAnmTextureSRTKey* btk1 = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("GiceL", GICEL_BTK_GICEL00_01)); JUT_ASSERT(0x6D, btk1 != NULL); - int result1 = mBtkAnm1.init(model_data, btk1, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int result1 = mBtkAnm1.init(model_data, btk1, true, J3DFrameCtrl::EMode_LOOP); J3DAnmTextureSRTKey* btk2 = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("GiceL", GICEL_BTK_GICEL00_02)); JUT_ASSERT(0x73, btk2 != NULL); - int result2 = mBtkAnm2.init(model_data, btk2, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int result2 = mBtkAnm2.init(model_data, btk2, true, J3DFrameCtrl::EMode_LOOP); J3DAnmTevRegKey * brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("GiceL", GICEL_BRK_GICEL00)); JUT_ASSERT(0x7A, brk != NULL); - int result3 = mBrkAnm.init(model_data, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int result3 = mBrkAnm.init(model_data, brk, true, J3DFrameCtrl::EMode_NONE); return((mpModel != NULL) && (result1 != 0) && (result2 != 0) && (result3 != 0)); } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 625c872d..aa65e583 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -1442,7 +1442,7 @@ BOOL daObj_Ikada_c::_createHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arc_name, IKADAH_BCK_SVSHIP_KAITEN); JUT_ASSERT(2180, bck != NULL); - if (!mBckAnm.init(modelData, bck, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { + if (!mBckAnm.init(modelData, bck, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } } diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index f4c2f202..2b491ae6 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -135,7 +135,7 @@ BOOL daObjMkie::Act_c::CreateHeap() { J3DAnmTevRegKey* brk_van = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, MKIEB_BRK_YLSMF00); JUT_ASSERT(0x1a5, brk_van != NULL); - int init = mBrkVan.init(model_data_van, brk_van, true, 0, 1.0f, 0, -1, false, 0); + int init = mBrkVan.init(model_data_van, brk_van, true, J3DFrameCtrl::EMode_NONE); bool ret = false; if (mModelBase != NULL && mModelVan != NULL && init != 0) { diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index 6546ee9e..e5e81fc9 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -61,7 +61,7 @@ BOOL daObjMkiek::Act_c::CreateHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, MKIEK_BRK_YLSMK00); JUT_ASSERT(0xA2, brk != NULL); - int result = mBrkAnm.init(model_data_v, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE); + int result = mBrkAnm.init(model_data_v, brk, true, J3DFrameCtrl::EMode_NONE); return result == 0 ? FALSE : mpModel != NULL && mpModelV != NULL; } diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 7ccf3c94..66628f67 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -166,7 +166,7 @@ bool daObjSwpush::Act_c::create_heap() { if (attr().mBtpArcName != NULL) { J3DAnmTexPattern* btp_data = (J3DAnmTexPattern*) dComIfG_getObjectRes(attr().mBtpArcName, attr().mBtpResIndex); JUT_ASSERT(0x21E, btp_data != NULL); - btp_success = mBtpAnm.init(model_data, btp_data, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE); + btp_success = mBtpAnm.init(model_data, btp_data, TRUE, J3DFrameCtrl::EMode_NONE); } cBgD_t* bg_data = (cBgD_t*) dComIfG_getObjectRes(attr().mBgArcName, attr().mBgResIndex); diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index 9e20747c..9d872cf4 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -84,7 +84,7 @@ BOOL Act_c::CreateHeap() { JUT_ASSERT(474, brk != NULL); mBrk1 = new mDoExt_brkAnm(); - if (mBrk1 == NULL || !mBrk1->init(model_data, brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mBrk1 == NULL || !mBrk1->init(model_data, brk, true, J3DFrameCtrl::EMode_LOOP)) { bVar3 = false; } } @@ -94,7 +94,7 @@ BOOL Act_c::CreateHeap() { JUT_ASSERT(487, btk != NULL); mBtk = new mDoExt_btkAnm(); - if (mBtk == NULL || !mBtk->init(model_data, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mBtk == NULL || !mBtk->init(model_data, btk, true, J3DFrameCtrl::EMode_LOOP)) { bVar4 = false; } } diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index fe7e1521..bdfc9544 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -96,7 +96,7 @@ BOOL daObjVgnfd_c::create_bdl_brk(int i) { J3DAnmTevRegKey* brk_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, M_brk_table[i])); JUT_ASSERT(0x105, brk_p != NULL); if (brk_p != NULL) { - if (mBrkAnm[i].init(mdl_data, brk_p, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) + if (mBrkAnm[i].init(mdl_data, brk_p, TRUE, J3DFrameCtrl::EMode_NONE)) ret = TRUE; } } else { @@ -140,7 +140,7 @@ BOOL daObjVgnfd_c::create_heap() { J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, VGNFD_BTK_YGCBD00)); JUT_ASSERT(0x144, btk_data != NULL); - if (btk_data == NULL || !mBtkAnm.init(mModel2[1]->getModelData(), btk_data, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + if (btk_data == NULL || !mBtkAnm.init(mModel2[1]->getModelData(), btk_data, TRUE, J3DFrameCtrl::EMode_NONE)) { ret = FALSE; } } diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 98867682..6310a7ff 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -104,7 +104,7 @@ bool daObjVmc::Act_c::create_heap() { { J3DAnmTransform* bck_wg = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWG); JUT_ASSERT(215, bck_wg != NULL); - BOOL ret = mBckAnmGrow.init(mdl_wd_data, bck_wg, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + BOOL ret = mBckAnmGrow.init(mdl_wd_data, bck_wg, TRUE, J3DFrameCtrl::EMode_NONE); mBckAnmGrow.setPlaySpeed(0.75f); if (!ret) return false; @@ -113,7 +113,7 @@ bool daObjVmc::Act_c::create_heap() { { J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWH); JUT_ASSERT(226, bck_wh != NULL); - if (!mBckAnmHookshot.init(mdl_wd_data, bck_wh, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBckAnmHookshot.init(mdl_wd_data, bck_wh, TRUE, J3DFrameCtrl::EMode_NONE)) return false; } diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 5d7b4248..e6c366dd 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -123,7 +123,7 @@ BOOL daObjVolcano::Act_c::CreateHeap() { J3DAnmTextureSRTKey * btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, YKZYG_BTK_QKZYG)); JUT_ASSERT(0xca, btk != NULL); - s32 btkRet = field_0x2FC.init(model_data, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE); + s32 btkRet = field_0x2FC.init(model_data, btk, TRUE, J3DFrameCtrl::EMode_LOOP); J3DModelData * model_data_fire = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, YKZYG_BDL_YMNKZ00)); JUT_ASSERT(0xe1, model_data_fire != NULL); @@ -131,11 +131,11 @@ BOOL daObjVolcano::Act_c::CreateHeap() { J3DAnmTextureSRTKey * btk_f = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, YKZYG_BTK_YMNKZ00)); JUT_ASSERT(0xec, btk_f != NULL); - s32 btkFRet = field_0x314.init(model_data_fire, btk_f, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE); + s32 btkFRet = field_0x314.init(model_data_fire, btk_f, TRUE, J3DFrameCtrl::EMode_LOOP); J3DAnmTevRegKey * brk_f = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, YKZYG_BRK_YMNKZ00)); JUT_ASSERT(0xf3, brk_f != NULL); - s32 brkRet = field_0x328.init(model_data_fire, brk_f, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE); + s32 brkRet = field_0x328.init(model_data_fire, brk_f, TRUE, J3DFrameCtrl::EMode_NONE); field_0x4F4 = 1; return field_0x2F8 != NULL && field_0x310 != NULL && btkRet != 0 && btkFRet != 0 && brkRet != 0; diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index 7de3040c..0b1381ae 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -191,7 +191,7 @@ bool daObj_Warpt_c::createHutaHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arc_name, LTUBW_BRK_YWPFM00); JUT_ASSERT(291, brk); - if (!mLidBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (!mLidBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } return true; diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 59cd7478..c82df177 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -218,7 +218,7 @@ void daPy_lk_c::setBowModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_ARROWRELORDA); JKRHeap* oldHeap = setItemHeap(); J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_BOW, 0x37221222); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(394, FALSE); } diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index f381731f..24c91af7 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -66,7 +66,7 @@ void daPy_lk_c::setLetterModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_GETLETTERA); JKRHeap* oldHeap = setItemHeap(); J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_LETTER, 0x13000022); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(120, FALSE); } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index b7ce0d10..c6b50026 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -121,7 +121,7 @@ void daPy_lk_c::setFanModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_USEFANAA); JKRHeap* oldHeap = setItemHeap(); J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_FAN, 0x37221222); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(242, FALSE); } @@ -134,7 +134,7 @@ void daPy_lk_c::setSmallFanModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_FANWAIT); JKRHeap* oldHeap = setItemHeap(); tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_FANSMALL, 0x37221222); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(275, FALSE); } diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index b108b39d..eb5c0970 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -21,7 +21,7 @@ void daPy_lk_c::setHammerModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_HAMMERDAM); JKRHeap* oldHeap = setItemHeap(); J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_HAMMER, 0x37221222); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(32, FALSE); } diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index 4da530ca..4468f46b 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -46,7 +46,7 @@ void daPy_lk_c::setHookshotModel() { J3DAnmTransform* bck = getItemAnimeResource(LKANM_BCK_HOOKSHOTA); JKRHeap* oldHeap = setItemHeap(); J3DModelData* tmp_modelData = initModel(&mpEquipItemModel, LINK_BDL_HOOKSHOT, 0x37221222); - int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + int ret = mSwordAnim.init(tmp_modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(100, FALSE); } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 2513fbc4..bcd76b50 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -11991,7 +11991,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpSwgripmsModel, LINK_BDL_SWGRIPMS, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_SWGRIPMSAB); - ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(20966, 20966, 21046, 21046), FALSE); } mpTswgripmsabBrk = entryBrk(tmp_modelData, LINK_BRK_TSWGRIPMSAB); mpTswgripmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSWGRIPMS); @@ -12000,7 +12000,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpShaModel, LINK_BDL_SHA, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_ATNGSHA); - ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); + ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE); if (!ret) { JUT_ASSERT(VERSION_SELECT(20983, 20983, 21063, 21063), FALSE); } tmp_modelData = initModel(&mpShmsModel, LINK_BDL_SHMS, 0x37221222); @@ -12020,7 +12020,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpYuchw00Model, LINK_BDL_YUCHW00, 0x13000222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_YUCHW00); - ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(21033, 21033, 21113, 21113), FALSE); } mpYuchw00Btk = entryBtk(tmp_modelData, LINK_BTK_YUCHW00); mpYuchw00Brk = entryBrk(tmp_modelData, LINK_BRK_YUCHW00); @@ -12040,14 +12040,14 @@ BOOL daPy_lk_c::createHeap() { } mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R); - ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(21067, 21067, 21147, 21147), FALSE); } mYaura00rBrk.entryFrame(0.0f); tmp_modelData = initModel(&mpYmgcs00Model, LINK_BDL_YMGCS00, 0x11001222); mpYmgcs00Btk = entryBtk(tmp_modelData, LINK_BTK_YMGCS00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS); - ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(VERSION_SELECT(21081, 21081, 21161, 21161), FALSE); } mYmgcs00Brk.entryFrame(0.0f); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 6e6ac0da..2fe6e0ca 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -66,7 +66,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) const sword_model_tbl_s& model_tbl = checkNormalSwordEquip() ? sword_model_tbl[0] : sword_model_tbl[1]; J3DModelData* modelData = initModel(&mpEquipItemModel, model_tbl.bladeModel, 0x37221222); - BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::EMode_LOOP); if (!ret) { JUT_ASSERT(86, FALSE); } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 109bb4d6..3fddaac5 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -259,7 +259,7 @@ BOOL daRd_c::_createHeap() { J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE)); JUT_ASSERT(DEMO_SELECT(528, 525), btk != NULL); - if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } @@ -267,7 +267,7 @@ BOOL daRd_c::_createHeap() { J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML)); JUT_ASSERT(DEMO_SELECT(553, 550), brk != NULL); - if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 8c141ed7..c994fd26 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -54,7 +54,7 @@ BOOL daSalvage_c::CreateHeap() { JUT_ASSERT(347, pbrk != NULL); mpBrk = new mDoExt_brkAnm(); - if (mpBrk == NULL || !mpBrk->init(mModelData, pbrk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBrk == NULL || !mpBrk->init(mModelData, pbrk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } @@ -62,7 +62,7 @@ BOOL daSalvage_c::CreateHeap() { JUT_ASSERT(361, pbtk != NULL); mpBtk = new mDoExt_btkAnm(); - if (mpBtk == NULL || !mpBtk->init(mModelData, pbtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBtk == NULL || !mpBtk->init(mModelData, pbtk, true, J3DFrameCtrl::EMode_LOOP)) { return false; } return true; diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 3039a04f..e8aa8b64 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -25,7 +25,7 @@ BOOL daSbox_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", DALWAYS_BDL_BOXSEA)); JUT_ASSERT(113, modelData != NULL); - if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_BOXOPENBOX)), true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_BOXOPENBOX)), true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index d6291b27..1f16bbd8 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -113,12 +113,12 @@ BOOL daSwhit0_c::CreateHeap() { } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW); - if (mAnm.init(modelData, anm, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) { + if (mAnm.init(modelData, anm, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW); - if (mTexAnm.init(modelData, texAnm, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { + if (mTexAnm.init(modelData, texAnm, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index 58153ff8..10264aff 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -113,7 +113,7 @@ bool Act_c::create_heap() { JUT_ASSERT(475, btk_data != NULL); mpBtk = new mDoExt_btkAnm(); - if (mpBtk != NULL && mpBtk->init(modelData, btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBtk != NULL && mpBtk->init(modelData, btk_data, true, J3DFrameCtrl::EMode_LOOP)) { bVar1 = TRUE; } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 4a03f690..036af422 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -103,7 +103,7 @@ cPhs_State daTbox_c::commonShapeSet() { } J3DAnmTextureSRTKey* appearTexData = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", mdlInfo.btkId); - if (mpAppearTexAnm->init(modelData, appearTexData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { + if (mpAppearTexAnm->init(modelData, appearTexData, true, J3DFrameCtrl::EMode_LOOP) == 0) { return cPhs_ERROR_e; } @@ -118,7 +118,7 @@ cPhs_State daTbox_c::commonShapeSet() { } J3DAnmTevRegKey* appearRegData = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", mdlInfo.brkId); - if (mpAppearRegAnm->init(modelData, appearRegData, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { + if (mpAppearRegAnm->init(modelData, appearRegData, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } @@ -142,7 +142,7 @@ cPhs_State daTbox_c::commonShapeSet() { } J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_YTRIF00); - if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { + if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } } @@ -174,17 +174,17 @@ cPhs_State daTbox_c::effectShapeSet() { } J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2); - if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH); - if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { + if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::EMode_NONE) == 0) { return cPhs_ERROR_e; } J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH); - int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::EMode_NONE); if (regInit) { return cPhs_COMPLEATE_e; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 70e3ae23..53579bcb 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -103,13 +103,13 @@ void daTitle_proc_c::proc_init3D() { J3DAnmTransform* bck_ship = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP))); JUT_ASSERT(VERSION_SELECT(0xED, 0xED, 0x118, 0x118), bck_ship != NULL); - BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); + BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP); JUT_ASSERT(VERSION_SELECT(0xF4, 0xF4, 0x11F, 0x11F), ok_bck != FALSE); J3DAnmColor* bpk_ship = static_cast<J3DAnmColor*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP))); JUT_ASSERT(VERSION_SELECT(0xF9, 0xF9, 0x124, 0x124), bpk_ship != NULL); - BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP); JUT_ASSERT(VERSION_SELECT(0xFF, 0xFF, 0x12A, 0x12A), ok_bpk != FALSE); mBpkShip.setFrame(0.0f); @@ -118,13 +118,13 @@ void daTitle_proc_c::proc_init3D() { J3DAnmTextureSRTKey* btk_sub = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E))); JUT_ASSERT(VERSION_SELECT(0x106, 0x106, 0x131, 0x131), btk_sub != NULL); - BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE); JUT_ASSERT(VERSION_SELECT(0x10D, 0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE); J3DAnmTextureSRTKey* btk_kirari = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E))); JUT_ASSERT(VERSION_SELECT(0x112, 0x112, 0x13D, 0x13D), btk_kirari != NULL); - BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP); JUT_ASSERT(VERSION_SELECT(0x119, 0x119, 0x144, 0x144), ok_btk_kirari != FALSE); mDoExt_restoreCurrentHeap(); diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index b6de10fc..e2175e05 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -261,11 +261,11 @@ BOOL daTornado_c::createHeap() { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); if (!mpModel) return FALSE; - if (!mBck.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YTRND00), true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) + if (!mBck.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YTRND00), true, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YTRND00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YTRND00), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YTRND00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YTRND00), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, TRND_BDL_YWUWT00); @@ -273,11 +273,11 @@ BOOL daTornado_c::createHeap() { mpModelUnder = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); if (!mpModelUnder) return FALSE; - if (!mBckUnder.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) + if (!mBckUnder.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; - if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 7665d2b0..551de40b 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -1240,7 +1240,7 @@ bool Act_c::create_heap() { mpBrk = new mDoExt_brkAnm(); if (mpBrk != NULL) { - if (mpBrk->init(modelData, brk_data, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBrk->init(modelData, brk_data, false, J3DFrameCtrl::EMode_LOOP)) { ret = true; } } diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index 4f8ad941..a0c5afa0 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -76,7 +76,7 @@ BOOL daWarpdm20_c::CreateHeap() { JUT_ASSERT(DEMO_SELECT(228, 233), pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); - if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mpBckAnm->setPlaySpeed(0.0f); @@ -88,7 +88,7 @@ BOOL daWarpdm20_c::CreateHeap() { JUT_ASSERT(DEMO_SELECT(270, 275), pbtk != NULL); mpBtkAnm = new mDoExt_btkAnm(); - if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } mpBtkAnm->setPlaySpeed(0.0f); @@ -100,7 +100,7 @@ BOOL daWarpdm20_c::CreateHeap() { JUT_ASSERT(DEMO_SELECT(290, 295), pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); - if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mpBrkAnm->setPlaySpeed(0.0f); diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 5b317f0b..9cc5a046 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -74,7 +74,7 @@ BOOL daWarpgn_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP00); JUT_ASSERT(0xDE, pbtk != NULL); mpBtkAnm1 = new mDoExt_btkAnm(); - if ((mpBtkAnm1 == NULL) || mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { + if ((mpBtkAnm1 == NULL) || mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP) == 0) { return FALSE; } mpBtkAnm1->setPlaySpeed(1.0f); @@ -82,7 +82,7 @@ BOOL daWarpgn_c::CreateHeap() { pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP02); JUT_ASSERT(0xED, pbtk != NULL); mpBtkAnm2 = new mDoExt_btkAnm(); - if ((mpBtkAnm2 == NULL) || mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { + if ((mpBtkAnm2 == NULL) || mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } mpBtkAnm2->setPlaySpeed(0.0f); @@ -90,7 +90,7 @@ BOOL daWarpgn_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BRK_GMJWP01); JUT_ASSERT(0xFF, pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); - if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { + if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } mpBrkAnm->setPlaySpeed(0.0f); @@ -98,7 +98,7 @@ BOOL daWarpgn_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, GMJWP_BCK_GMJWP01); JUT_ASSERT(0x10F, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); - if (mpBckAnm == NULL || mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + if (mpBckAnm == NULL || mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } mpBckAnm->setPlaySpeed(0.0f); diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index 90b4e4da..88a3d7c0 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -82,7 +82,7 @@ BOOL daWarphr_c::CreateHeap() { JUT_ASSERT(VERSION_SELECT(226, 230, 239, 239), pbtk != NULL); mpBtkAnm1 = new mDoExt_btkAnm(); - if (mpBtkAnm1 == NULL || !mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, FALSE)) { + if (mpBtkAnm1 == NULL || !mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } mpBtkAnm1->setPlaySpeed(1.0f); @@ -103,7 +103,7 @@ BOOL daWarphr_c::CreateHeap() { mpBtkAnm2 = new mDoExt_btkAnm(); - if (mpBtkAnm2 == NULL || !mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + if (mpBtkAnm2 == NULL || !mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mpBtkAnm2->setPlaySpeed(0.0f); @@ -116,7 +116,7 @@ BOOL daWarphr_c::CreateHeap() { mpBrkAnm = new mDoExt_brkAnm(); - if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE)) { return FALSE; } mpBrkAnm->setPlaySpeed(0.0f); diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 865c3dcc..28aae373 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -77,17 +77,17 @@ BOOL daWindTag::daWindTag_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mType], m_btkidx[mType]); JUT_ASSERT(0x17A, pbtk != NULL); - if (!mBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mType], m_btkidx2[mType]); JUT_ASSERT(0x17A, pbtk != NULL); - if (!mBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname[mType], m_bckidx[mType]); JUT_ASSERT(0x192, pbck != NULL); - if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index 0dc7903a..8a1e557c 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -62,7 +62,7 @@ BOOL daYgcwp_c::create_heap() { J3DAnmTevRegKey* brk_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, M_brk_table[i])); JUT_ASSERT(0xC9, brk_p != NULL); if (brk_p != NULL) { - if (!mBrkAnm[i].init(mdl_data, brk_p, TRUE, M_brk_mode_table[i], 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm[i].init(mdl_data, brk_p, TRUE, M_brk_mode_table[i])) { ret = FALSE; break; } diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index 804bfe3e..b2d19c0e 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -191,12 +191,12 @@ BOOL daYougan_c::useHeapInit() { #endif } for(s32 i = 0; i < yg_awa_num; i++) { - if(!field_0x298[i].field_0x08.init(modelData, anmKey, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { + if(!field_0x298[i].field_0x08.init(modelData, anmKey, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } } for(s32 i = 0; i < yg_awa_num; i++) { - if(!field_0x298[i].field_0x18.init(modelData, srtKey, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { + if(!field_0x298[i].field_0x18.init(modelData, srtKey, TRUE, J3DFrameCtrl::EMode_NONE)) { return FALSE; } } diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index 0dee8e4d..9afbe70c 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -472,7 +472,7 @@ BOOL dDoor_key2_c::keyCreate_Nkey() { return FALSE; J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCN); - if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; return TRUE; @@ -488,7 +488,7 @@ BOOL dDoor_key2_c::keyCreate_Bkey() { return FALSE; J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCB); - if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) + if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE)) return FALSE; J3DSkinDeform* deform = new J3DSkinDeform(); @@ -719,7 +719,7 @@ BOOL dDoor_hkyo_c::create() { return FALSE; J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hkyo", HKYO_BRK_HKYO1B); - if (!mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP)) return FALSE; return TRUE; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 63e54c50..62ed6215 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -126,12 +126,12 @@ cPhs_State dThunder_c::create() { J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", ALWAYS_BTK_YTHDR00); JUT_ASSERT(DEMO_SELECT(126, 125), anm != NULL); - if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) + if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::EMode_LOOP)) return cPhs_ERROR_e; J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", ALWAYS_BRK_YTHDR00); JUT_ASSERT(DEMO_SELECT(141, 140), canm != NULL); - if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) + if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::EMode_NONE)) return cPhs_ERROR_e; mBtkTime = cM_rndF(1.0f); diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 8327635a..db2559a4 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -115,7 +115,7 @@ void dLib_debugDrawFan(cXyz& center, s16 angleY, s16 fanSpreadAngle, f32 radius, bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcName, int fileno) { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, fileno); JUT_ASSERT(0xae, brk != NULL); - if (anm->init(modelData, brk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) + if (anm->init(modelData, brk, 1, J3DFrameCtrl::EMode_NONE) == 0) return false; return true; } @@ -124,7 +124,7 @@ bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcNa bool dLib_btkInit(J3DModelData* modelData, mDoExt_btkAnm* anm, const char* arcName, int fileno) { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, fileno); JUT_ASSERT(0xbb, btk != NULL); - if (anm->init(modelData, btk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) + if (anm->init(modelData, btk, 1, J3DFrameCtrl::EMode_NONE) == 0) return false; return true; } diff --git a/src/d/d_material.cpp b/src/d/d_material.cpp index af9092d0..b64aa3aa 100644 --- a/src/d/d_material.cpp +++ b/src/d/d_material.cpp @@ -24,7 +24,7 @@ void dMat_backup_c::restore() { /* 8006F69C-8006F740 .text create__10dMat_ice_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */ void dMat_ice_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) { mMaterialTable = param_1; - int rt = mBtkAnm.init(mMaterialTable, param_2, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int rt = mBtkAnm.init(mMaterialTable, param_2, TRUE, J3DFrameCtrl::EMode_LOOP); JUT_ASSERT(98, rt != FALSE); mBtkAnm.entry(mMaterialTable); } diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index d688a7a8..b0ce7868 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1414,7 +1414,7 @@ ShopCursor_c::ShopCursor_c(J3DModelData* modelData, J3DAnmTevRegKey* brkData, f3 } mpBrkData = brkData; - if (!mBrkAnm.init(modelData, mpBrkData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, mpBrkData, true, J3DFrameCtrl::EMode_LOOP)) { mpBrkData = NULL; } diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index d83f2ff9..2b1180cc 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -127,7 +127,7 @@ cPhs_State dWindArrow_c::create() { J3DAnmTextureSRTKey* anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_YA); JUT_ASSERT(0x65, anm != NULL); - if (!mModelInfo.mBtkAnm.init(modelData, anm, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { + if (!mModelInfo.mBtkAnm.init(modelData, anm, TRUE, J3DFrameCtrl::EMode_LOOP)) { return cPhs_ERROR_e; } |
