diff options
| author | robojumper <robojumper@gmail.com> | 2025-10-01 16:07:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-01 16:07:33 +0200 |
| commit | 0b05b4a9e75bf511ea81b332fb869110802d091f (patch) | |
| tree | 57a2a1d1f9e439a025ba7fb95b6d84440991594f /include | |
| parent | 3c4bfedd5d1591c60bddffe0cd196c90db852cfc (diff) | |
| parent | 0abd919314572692964589861b2c32148f520097 (diff) | |
Merge pull request #258 from gymnast86/obj-warp-hole
d_a_obj_warp_hole OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/npc/d_a_npc_kensei.h | 8 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_warp_hole.h | 22 | ||||
| -rw-r--r-- | include/d/d_player_act.h | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/include/d/a/npc/d_a_npc_kensei.h b/include/d/a/npc/d_a_npc_kensei.h index 2d2c77eb..292f8e31 100644 --- a/include/d/a/npc/d_a_npc_kensei.h +++ b/include/d/a/npc/d_a_npc_kensei.h @@ -10,8 +10,16 @@ public: dAcNpcKensei_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcNpcKensei_c() {} + static dAcNpcKensei_c* GetInstance() { + return sInstance; + } + private: + static dAcNpcKensei_c *sInstance; + /* 0x??? */ STATE_MGR_DECLARE(dAcNpcKensei_c); }; + + #endif diff --git a/include/d/a/obj/d_a_obj_warp_hole.h b/include/d/a/obj/d_a_obj_warp_hole.h index 1df439af..4defe361 100644 --- a/include/d/a/obj/d_a_obj_warp_hole.h +++ b/include/d/a/obj/d_a_obj_warp_hole.h @@ -2,13 +2,33 @@ #define D_A_OBJ_WARP_HOLE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/cc/d_cc_d.h" +#include "toBeSorted/actor_event.h" +#include "toBeSorted/d_emitter.h" class dAcOwarpHole_c : public dAcObjBase_c { public: - dAcOwarpHole_c() {} + dAcOwarpHole_c() : mEvent(*this, nullptr) {} virtual ~dAcOwarpHole_c() {} + virtual bool createHeap() override; + virtual int create() override; + + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int actorExecuteInEvent() override; + virtual int draw() override; + private: + /* 0x330 */ dCcD_Cyl mCcCyl; + /* 0x480 */ EffectsStruct mEff; + /* 0x4B4 */ ActorEventRelated mEvent; + /* 0x504 */ mVec3_c mLinkPos; + /* 0x510 */ u8 mExitListIdx; + /* 0x511 */ u8 mWalkFramesMaybe; + + static dCcD_SrcCyl sCylSrc; + static const float dummy600; }; #endif diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h index b06ba8fa..c5096561 100644 --- a/include/d/d_player_act.h +++ b/include/d/d_player_act.h @@ -412,7 +412,7 @@ public: /* vt 0x2A8 */ virtual void lookTowardItem() {} /* vt 0x2AC */ virtual void vt_0x2AC() {} /* vt 0x2B0 */ virtual void vt_0x2B0() {} - /* vt 0x2B4 */ virtual void triggerMoveEventMaybe() {} + /* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, mVec3_c &, const mAng&, u32, u32) {} /* vt 0x2B8 */ virtual void setActorRef9() {} /* vt 0x2BC */ virtual void unlinkActorRef9() {} /* vt 0x2C0 */ virtual bool vt_0x2C0() { |