diff --git a/include/d/d_path.h b/include/d/d_path.h index c30446e9492..e68c146eb74 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -4,15 +4,15 @@ #include "dolphin/types.h" #include "d/d_stage.h" -class dPath { -public: +class dStage_dPnt_c; + +struct dPath { /* 0x0 */ u16 m_num; /* 0x2 */ u16 m_nextID; /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 m_closed; /* 0x6 */ u8 field_0x6; /* 0x8 */ dStage_dPnt_c* m_points; - }; // should be move to dlib TU per chn debug diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index f8dcbdcf61a..5e65b581204 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -244,11 +244,11 @@ public: /* 8000FAE8 */ virtual ~mDoExt_morf_c(); void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); } + void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); } f32 getPlaySpeed() { return mFrameCtrl.getRate(); } f32 getFrame() { return mFrameCtrl.getFrame(); } u8 getPlayMode() { return mFrameCtrl.getAttribute(); } bool isLoop() { return mFrameCtrl.checkState(2); } - void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); } f32 getEndFrame() { return mFrameCtrl.getEnd(); } bool isStop() {