diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2025-11-23 02:29:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-23 02:29:49 -0500 |
| commit | 57557d11285aeff9ffd86c6e57fdc09b62b391d1 (patch) | |
| tree | 9381837b90d062335cf1fd9a87c86822c568abd8 /src/d/a/obj/d_a_obj_fairy.cpp | |
| parent | 3492eac0b23272356b07268ff547494941158e89 (diff) | |
| parent | 167ee588e064a771e9b581f2c20090ebe8c3c27a (diff) | |
Merge pull request #272 from elijah-thomas774/mAng
change mAng to template operators
Diffstat (limited to 'src/d/a/obj/d_a_obj_fairy.cpp')
| -rw-r--r-- | src/d/a/obj/d_a_obj_fairy.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/d/a/obj/d_a_obj_fairy.cpp b/src/d/a/obj/d_a_obj_fairy.cpp index 0cdb8c84..22824411 100644 --- a/src/d/a/obj/d_a_obj_fairy.cpp +++ b/src/d/a/obj/d_a_obj_fairy.cpp @@ -130,7 +130,7 @@ int dAcOFairy_c::create() { if (isWithinPlayerRadius(200.0f) && getXZAngleToPlayer().absDiff(mAng::fromVec(mVelocity)) < 0x2000) { mVelocity.rotY(0x8000); - mAngle.y += 0x8000; + mAngle.y += mAng(0x8000); } mModel.setAnm("PutFairy_fly", m3d::PLAY_MODE_4, 0.0f); @@ -210,9 +210,7 @@ int dAcOFairy_c::actorExecute() { } if (!field_0xB89) { - mEffects[0].holdEffect( - PARTICLE_RESOURCE_ID_MAPPING_331_, mPosition, nullptr, nullptr, nullptr, nullptr - ); + mEffects[0].holdEffect(PARTICLE_RESOURCE_ID_MAPPING_331_, mPosition, nullptr, nullptr, nullptr, nullptr); if (!isCuring() && !dAcPy_c::GetLink()->checkActionFlagsCont(0x400000)) { holdSound(SE_O_FAIRY_FLY_LEV); } @@ -237,9 +235,7 @@ int dAcOFairy_c::actorExecute() { } if (isCuring() && !field_0xB89) { - mEffects[1].holdEffect( - PARTICLE_RESOURCE_ID_MAPPING_327_, mPosition, nullptr, nullptr, nullptr, nullptr - ); + mEffects[1].holdEffect(PARTICLE_RESOURCE_ID_MAPPING_327_, mPosition, nullptr, nullptr, nullptr, nullptr); } if (!mStateMgr.isState(StateID_CatchDemo) && !isCuring()) { |