diff options
| author | robojumper <robojumper@gmail.com> | 2024-11-22 13:13:02 +0100 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2024-11-22 13:13:02 +0100 |
| commit | ca36a0123cba816ece0149ef663f8fbaf233a024 (patch) | |
| tree | 6f120578fae2cf0f816bfc1c5cc65119d6cfd100 /include/d/a | |
| parent | 15d932d1eac1a32dfb053130710393fff6368c43 (diff) | |
More
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_base.h | 3 | ||||
| -rw-r--r-- | include/d/a/d_a_player.h | 2 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_tbox.h | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h index 946d0ca4..90afd1dc 100644 --- a/include/d/a/d_a_base.h +++ b/include/d/a/d_a_base.h @@ -9,6 +9,7 @@ #include "toBeSorted/tlist.h" class dAcBase_c; +struct cBgS_PolyInfo; struct SoundSource { // TODO @@ -255,7 +256,7 @@ public: /* 8002dd50 */ void FUN_8002dd50(); /* 8002dd90 */ void FUN_8002dd90(); /* 8002ddd0 */ void FUN_8002ddd0(); - /* 8002de30 */ void FUN_8002de30(); + /* 8002de30 */ void FUN_8002de30(cBgS_PolyInfo &p); public: /* 80571920 */ static u32 s_Create_RoomId; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 139a511a..8c3ea526 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -51,6 +51,8 @@ public: void setTransform(const mMtx_c &mtx, UNKWORD, UNKWORD, UNKWORD); void setPosYRot(const mVec3_c &pos, mAng rot, UNKWORD, UNKWORD, UNKWORD); + // argument is always false in existing code, true doesn't seem to make a difference + void bonk(bool unk = false); /* vt 0x080 */ virtual UNKWORD IfCurrentActionToActor(dAcBase_c *ac, UNKWORD); /* vt 0x084 */ virtual void vt_0x084(dAcBase_c *ac, UNKWORD); diff --git a/include/d/a/obj/d_a_obj_tbox.h b/include/d/a/obj/d_a_obj_tbox.h index 015fb613..f621a13a 100644 --- a/include/d/a/obj/d_a_obj_tbox.h +++ b/include/d/a/obj/d_a_obj_tbox.h @@ -116,13 +116,13 @@ private: void noUnregisterDowsing(); static bool fn_80268660(int arg); - void fn_8026E090(); + bool checkForLinkBonk(); void fn_8026E630(); bool fn_8026D540(); bool fn_8026D3C0(); void syncScaleToMdl(m3d::scnLeaf_c *lf); - void fn_8026DD70(mVec3_c *out1, mVec3_c *out2); - void getCylParams(mVec3_c *out1, f32 *out2, f32 *out3); + void getCCBounds(mVec3_c *out1, mVec3_c *out2) const; + void getCylParams(mVec3_c *out1, f32 *out2, f32 *out3) const; void fn_8026DAD0(mVec3_c *src, mVec3_c *dest) const; void fn_8026DAC0(mAng& ang); |