diff options
| author | hev7 <143887945+hev7@users.noreply.github.com> | 2025-11-24 23:30:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-24 15:30:01 -0800 |
| commit | cd3d634133040864768d9cc7364b02ce1f22e99b (patch) | |
| tree | 82b2f302127be3480e2829063ae60aa8cd2b8a1f /src/d | |
| parent | c4df6a577121f3bc0c8c63a4194a55a107def255 (diff) | |
Link npc_guard (#2859)
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/actor/d_a_npc_guard.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index c781941ade..dc5ff601c7 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -336,7 +336,7 @@ void daNpcGuard_c::setAngle() { } /* 809F0DE0-809F0ED4 001100 00F4+00 1/1 0/0 0/0 .text setSpeed__12daNpcGuard_cFffPfi */ -inline void daNpcGuard_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4) { +void daNpcGuard_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4) { f32 target = field_0xd8c * (param_2 * field_0xd8c); f32 step = field_0xd8c * (param_1 * field_0xd8c); @@ -410,25 +410,6 @@ static int daNpcGuard_Create(void* i_this) { return static_cast<daNpcGuard_c*>(i_this)->create(); } -/* 809F12F0-809F14CC 001610 01DC+00 1/1 0/0 0/0 .text create__12daNpcGuard_cFv */ -int daNpcGuard_c::create() { - fopAcM_ct(this, daNpcGuard_c); - - m_type = cLib_getRndValue(0, 2); - mObjNum = 2; - int phase = loadResrc(m_type, mObjNum); - if (phase == cPhs_COMPLEATE_e) { - if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2220)) { - // Failed to create actor! - OS_REPORT("アクター生成失敗しました!\n"); - return cPhs_ERROR_e; - } - create_init(); - } - - return phase; -} - void daNpcGuard_c::initCollision() { dCcD_SrcSph sph = { { @@ -543,6 +524,25 @@ void daNpcGuard_c::lookat() { mLookat.action(cStack_80, eyePos, this, afStack_38, NULL != mActorMngr.getActorP()); } +/* 809F12F0-809F14CC 001610 01DC+00 1/1 0/0 0/0 .text create__12daNpcGuard_cFv */ +int daNpcGuard_c::create() { + fopAcM_ct(this, daNpcGuard_c); + + m_type = cLib_getRndValue(0, 2); + mObjNum = 2; + int phase = loadResrc(m_type, mObjNum); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2220)) { + // Failed to create actor! + OS_REPORT("アクター生成失敗しました!\n"); + return cPhs_ERROR_e; + } + create_init(); + } + + return phase; +} + /* 809F1F40-809F1F74 002260 0034+00 1/0 0/0 0/0 .text daNpcGuard_Delete__FPv */ static int daNpcGuard_Delete(void* i_this) { static_cast<daNpcGuard_c*>(i_this)->~daNpcGuard_c(); |
