diff options
| author | Max Roncace <me@caseif.net> | 2025-07-15 20:00:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-15 23:00:01 +0300 |
| commit | 5c86d6d26f15ae2b60f150cecbbf946d17c20595 (patch) | |
| tree | 34606bbc6ca4f23962322f4ef55fa917be44b41a /include | |
| parent | 70f0ed7ef7b0226db13ea1b3735d15f0887bb48c (diff) | |
Minor d_a_alink fixes (#2534)
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JHostIO/JORMContext.h | 5 | ||||
| -rw-r--r-- | include/d/actor/d_a_alink.h | 4 | ||||
| -rw-r--r-- | include/m_Do/m_Do_mtx.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h index 9c117a5f02..930e66b2d8 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/include/JSystem/JHostIO/JORMContext.h @@ -151,6 +151,10 @@ public: genNodeSub(label, obj, param_2, param_3); } + void endUpdateNode() { + // empty function + } + void startUpdateNode(JORReflexible* obj) { putNode(obj); } @@ -240,6 +244,7 @@ public: void updateControl(u32 mode, u32 id, u32 param_2); void updateControl(u32 mode, u32 id, const char* param_2); + void updateLabel(u32 mode, u32 id, const char* param_2) { updateControl(mode, id, param_2); } void updateSliderSub(u32 mode, u32 id, s32 value, s32 rangeMin, s32 rangeMax, u32 param_5); void updateCheckBoxSub(u32 mode, u32 id, u16 value, u16 mask, u32 param_4); diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 5680558bf4..07cdc6619a 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -3,8 +3,6 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DMatBlock.h" -#include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "Z2AudioLib/Z2Creature.h" #include "Z2AudioLib/Z2WolfHowlMgr.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_mmsg.h" @@ -228,6 +226,8 @@ public: /* 80140B88 */ daAlinkHIO_c(); /* 80140C10 */ virtual ~daAlinkHIO_c(); + void jumpStateUpdate(const cXyz*, const cXyz*, f32); + /* 0x04 */ u8 field_0x4[0xC - 0x4]; /* 0x0C */ daAlinkHIO_cut_c mCut; /* 0x0D */ u8 field_0xD[0x4B - 0xD]; diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 7baa559268..12e730c9a6 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -24,7 +24,7 @@ void mDoMtx_ZrotM(Mtx mtx, s16 z); bool mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]); void mDoMtx_QuatConcat(Quaternion const* param_0, Quaternion const* param_1, Quaternion* param_2); -inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { +inline void mDoMtx_multVecSR(const Mtx m, const Vec* src, Vec* dst) { MTXMultVecSR(m, src, dst); } |