mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 05:14:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add checkFrame helper to mDoExt_baseAnm

Browse Source
This commit is contained in:
Erilea
2024-05-28 11:19:38 +02:00
parent cb58c240e3
commit 6a0462aecd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_ext.h
+1
View File
@@ -28,6 +28,7 @@ public:
J3DFrameCtrl* getFrameCtrl() { return mFrameCtrl; }
f32 getPlaySpeed() { return mFrameCtrl->getRate(); }
void setPlaySpeed(f32 speed) { mFrameCtrl->setRate(speed); }
BOOL checkFrame(f32 frame) { return mFrameCtrl->checkPass(frame); }
f32 getFrame() { return mFrameCtrl->getFrame(); }
f32 getEndFrame() { return mFrameCtrl->getEnd(); }
void setFrame(f32 frame) { mFrameCtrl->setFrame(frame); }
src/d/actor/d_a_obj_gryw00.cpp
+2 -2
View File
@@ -198,14 +198,14 @@ void daObjGryw00_c::switch_wait_act_proc() {
/* 00000B50-00000BB0 .text spread_water_face_act_proc__13daObjGryw00_cFv */
void daObjGryw00_c::spread_water_face_act_proc() {
if (mBtk.getFrameCtrl()->checkPass(START_PHASE_ANIM_LEN)) {
if (mBtk.checkFrame(SPREAD_PHASE_ANIM_LEN)) {
modeFunc = &water_level_move_wait_act_proc;
}
}
/* 00000BB0-00000C44 .text water_level_move_wait_act_proc__13daObjGryw00_cFv */
void daObjGryw00_c::water_level_move_wait_act_proc() {
if (mBtk.getFrameCtrl()->checkPass(SPREAD_PHASE_ANIM_LEN)) {
if (mBtk.checkFrame(RISE_PHASE_ANIM_LEN)) {
mWaterLvIncrement = WATER_RISE_SPEED;
mWaterMaxLv = HIGH_WATER_LEVEL;
modeFunc = &anime_loop_start_wait_act_proc;