diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-01-27 19:26:14 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-01-27 19:26:14 -0500 |
| commit | 901bc51f40b875338e5c7552ffd2b58e0cdaae83 (patch) | |
| tree | 5e9e915efd96e4253286624b33ee4ebe47f35ab9 /src/m_Do/m_Do_ext.cpp | |
| parent | 46801e0ee9dce4d085e028a83fef010c066185e3 (diff) | |
d_a_npc_md work
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 55ae8555..15eed925 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1567,8 +1567,8 @@ void mDoExt_McaMorf2::calc(u16 param_0) { *infoPtr = spD8[0]; } else { mpAnm2->getTransform(param_0, &spD8[1]); - f31 = 1.0f - field_0x84; - f30 = field_0x84; + f31 = 1.0f - mAnmRate; + f30 = mAnmRate; infoPtr->mScale.x = spD8[0].mScale.x * f31 + spD8[1].mScale.x * f30; infoPtr->mScale.y = spD8[0].mScale.y * f31 + spD8[1].mScale.y * f30; infoPtr->mScale.z = spD8[0].mScale.z * f31 + spD8[1].mScale.z * f30; @@ -1602,8 +1602,8 @@ void mDoExt_McaMorf2::calc(u16 param_0) { } else { mpAnm1->getTransform(param_0, &spD8[0]); mpAnm2->getTransform(param_0, &spD8[1]); - f31 = 1.0f - field_0x84; - f30 = field_0x84; + f31 = 1.0f - mAnmRate; + f30 = mAnmRate; sp68.mScale.x = spD8[0].mScale.x * f31 + spD8[1].mScale.x * f30; sp68.mScale.y = spD8[0].mScale.y * f31 + spD8[1].mScale.y * f30; sp68.mScale.z = spD8[0].mScale.z * f31 + spD8[1].mScale.z * f30; @@ -1639,7 +1639,7 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* bckAnm1, J3DAnmTransform* bckAnm2, void* basAnm) { mpAnm1 = bckAnm1; mpAnm2 = bckAnm2; - field_0x84 = f1; + mAnmRate = f1; setStartFrame(startFrame); if (endFrame < 0.0f) { if (!mpAnm1) { |