summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_kantera.cpp
diff options
context:
space:
mode:
author123456789758 <205478182+123456789758@users.noreply.github.com>2026-06-16 14:55:36 -0400
committerGitHub <noreply@github.com>2026-06-16 14:55:36 -0400
commitd61a31e7ab30ef357060124bae1830939106104b (patch)
tree409e8cd3e8f81a3cd516470a88b4a237636e2bd5 /src/d/actor/d_a_kantera.cpp
parentf2d931cd81b76b5e7ab29f6b53d172040d088a23 (diff)
Use joint enums in several different places (#981)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
Diffstat (limited to 'src/d/actor/d_a_kantera.cpp')
-rw-r--r--src/d/actor/d_a_kantera.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp
index f1a91c92..9113d7e1 100644
--- a/src/d/actor/d_a_kantera.cpp
+++ b/src/d/actor/d_a_kantera.cpp
@@ -16,15 +16,15 @@
static BOOL kantera_nodeCallBack(J3DNode* node, int calcTiming) {
if (calcTiming == J3DNodeCBCalcTiming_In) {
J3DJoint* joint = (J3DJoint*)node;
- s32 uVar2 = joint->getJntNo();
+ s32 jntNo = joint->getJntNo();
J3DModel* model = j3dSys.getModel();
kantera_class* i_this = (kantera_class*)model->getUserArea();
- if ((i_this != NULL) && (uVar2 == 0 || (uVar2 == 1))) {
- MTXCopy(model->getAnmMtx(uVar2), *calc_mtx);
- cMtx_XrotM(*calc_mtx, i_this->mJointBaseRot.x + i_this->mJointRot[uVar2].x);
- cMtx_ZrotM(*calc_mtx, i_this->mJointBaseRot.z + i_this->mJointRot[uVar2].z);
- model->setAnmMtx(uVar2, *calc_mtx);
+ if ((i_this != NULL) && (jntNo == MK_KANTERA_JNT_TOTTE_e || (jntNo == MK_KANTERA_JNT_KANTERA_e))) {
+ MTXCopy(model->getAnmMtx(jntNo), *calc_mtx);
+ cMtx_XrotM(*calc_mtx, i_this->mJointBaseRot.x + i_this->mJointRot[jntNo].x);
+ cMtx_ZrotM(*calc_mtx, i_this->mJointBaseRot.z + i_this->mJointRot[jntNo].z);
+ model->setAnmMtx(jntNo, *calc_mtx);
MTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
}
}
@@ -254,7 +254,7 @@ static BOOL daKantera_Execute(kantera_class* i_this) {
i_this->actor.eyePos = i_this->actor.current.pos;
- MTXCopy(model->getAnmMtx(1), *calc_mtx);
+ MTXCopy(model->getAnmMtx(MK_KANTERA_JNT_KANTERA_e), *calc_mtx);
i_this->m2E4 = i_this->mBonPos;