diff options
Diffstat (limited to 'src/d/actor/d_a_pw.cpp')
| -rw-r--r-- | src/d/actor/d_a_pw.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 6d81c6d2..d5ad2ce9 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -176,13 +176,13 @@ void action_dousa(pw_class* i_this) { cXyz camfwd; switch (i_this->mState) { case 0: - anm_init(i_this, PW_BCK_WAIT1, 7.0, J3DFrameCtrl::LOOP_REPEAT_e, 1.0, -1); + anm_init(i_this, PW_BCK_WAIT1, 7.0, J3DFrameCtrl::EMode_LOOP, 1.0, -1); i_this->m346 = 0; i_this->mState += 1; break; case 1: if (fopAcM_searchPlayerDistance(i_this) < 500.0f) { - anm_init(i_this, PW_BCK_DERUA1, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUA1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m38C = fopAcM_searchPlayerAngleY(i_this); i_this->current.angle.y = i_this->m38C; i_this->shape_angle.y = i_this->m38C; @@ -277,7 +277,7 @@ void action_dousa(pw_class* i_this) { i_this->m38C = fopAcM_searchPlayerAngleY(i_this); i_this->current.angle.y = i_this->m38C; i_this->shape_angle.y = i_this->m38C; - anm_init(i_this, PW_BCK_DERUB2, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUB2, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState = 6; } break; @@ -285,7 +285,7 @@ void action_dousa(pw_class* i_this) { i_this->m380 = 2; i_this->m346 = 1; if (fopAcM_searchPlayerDistance(i_this) < i_this->m3AC) { - anm_init(i_this, PW_BCK_DERUB1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUB1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState = 7; } break; @@ -297,9 +297,9 @@ void action_dousa(pw_class* i_this) { i_this->m341 = 0; i_this->m378 = cM_rndF(60.0f) + 60.0f; if (i_this->m346 && i_this->mBckIdx != PW_BCK_WAIT1) { - anm_init(i_this, PW_BCK_WAIT1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_WAIT1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else if (i_this->mBckIdx != PW_BCK_WAIT2) { - anm_init(i_this, PW_BCK_WAIT2, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_WAIT2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mState += 1; // Fall-through @@ -314,11 +314,11 @@ void action_dousa(pw_class* i_this) { i_this->m378 = cM_rndF(120.0f) + 120.0f; if (i_this->m346 == 1) { if (i_this->mBckIdx != PW_BCK_IDOU1) { - anm_init(i_this, PW_BCK_IDOU1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_IDOU1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } else { if (i_this->mBckIdx != PW_BCK_IDOU2) { - anm_init(i_this, PW_BCK_IDOU2, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_IDOU2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } i_this->m38C += (s16)cM_rndFX(16384.0f); @@ -359,7 +359,7 @@ void action_dousa(pw_class* i_this) { break; case 25: i_this->m38C = fopAcM_searchPlayerAngleY(i_this); - anm_init(i_this, PW_BCK_DAMAGE_K1, 9.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DAMAGE_K1, 9.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = -2.0f; i_this->mState += 1; break; @@ -384,11 +384,11 @@ void action_dousa(pw_class* i_this) { case 92: break; case 100: - anm_init(i_this, PW_BCK_JITTAIKA1, 6.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_JITTAIKA1, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState += 1; break; case 110: - anm_init(i_this, PW_BCK_ATTACK1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_ATTACK1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); // TODO i_this->mState += 1; break; @@ -403,7 +403,7 @@ void action_dousa(pw_class* i_this) { i_this->speedF = 0.0f; i_this->speed.setall(0.0f); i_this->gravity = 0.0f; - anm_init(i_this, PW_BCK_SIRIMOTI1, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_SIRIMOTI1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState += 1; case 112: // Fall-through |