diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-21 19:18:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-21 19:18:46 -0400 |
| commit | ab5659b2016b4040424198f2f33080e125182f21 (patch) | |
| tree | 5c0faf528ecf13a22347b3ccc1e9d939ed636282 /src/d/actor/d_a_npc_jb1.cpp | |
| parent | d10eaa3ef8b258d5edc4eb8756280155ec342481 (diff) | |
d_a_player_main cleanup and some demo matches (#1016)
* d_a_player_main cleanup and some demo matches
* Add unions for player_main procvars
* Make d_a_player_main fields private
Diffstat (limited to 'src/d/actor/d_a_npc_jb1.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_jb1.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index c07b012f..2ed49695 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -618,19 +618,20 @@ J3DModelData* daNpc_Jb1_c::create_Anm() { } else if(mpMorf->getModel() == NULL) { mpMorf = NULL; return NULL; + } + + m_lmp_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", JB_BRK_JB_LAMP); + JUT_ASSERT(VERSION_SELECT(0x464, 0x46E, 0x473, 0x473), m_lmp_brk != NULL); + bool temp = mBrkAnm.init(mpMorf->getModel()->getModelData(), m_lmp_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + if(temp == false) { + mpMorf = NULL; + return NULL; } else { - m_lmp_brk = (J3DAnmTevRegKey*)dComIfG_getObjectIDRes("Jb", JB_BRK_JB_LAMP); - JUT_ASSERT(VERSION_SELECT(0x464, 0x46E, 0x473, 0x473), m_lmp_brk != NULL); - bool temp = mBrkAnm.init(mpMorf->getModel()->getModelData(), m_lmp_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); - if(temp == false) { - mpMorf = NULL; - return NULL; - } else { - field_0x834 = 0; - m_cse_jnt_num = mpMorf->getModel()->getModelData()->getJointName()->getIndex("jb_case"); - JUT_ASSERT(VERSION_SELECT(0x46F, 0x479, 0x47E, 0x47E), m_cse_jnt_num >= 0); - } + field_0x834 = 0; + m_cse_jnt_num = mpMorf->getModel()->getModelData()->getJointName()->getIndex("jb_case"); + JUT_ASSERT(VERSION_SELECT(0x46F, 0x479, 0x47E, 0x47E), m_cse_jnt_num >= 0); } + return a_mdl_dat; } |