summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_rd.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-04-16 20:48:05 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-04-16 20:48:05 -0400
commite1f3d5ce93f4aabd642414395e883a51a5bc6104 (patch)
treeea78a0fb7063e2f759a4d1efeebc29df61c21743 /src/d/actor/d_a_rd.cpp
parent9d746447f9c1047699a0bce5884e8e8b3ec975e2 (diff)
fix some regressions
Diffstat (limited to 'src/d/actor/d_a_rd.cpp')
-rw-r--r--src/d/actor/d_a_rd.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index d75549d6..bd6b57e1 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -179,15 +179,15 @@ BOOL daRd_c::_nodeControl(J3DNode* node, J3DModel* model) {
static cXyz l_offsetAttPos(0.0f, 0.0f, 0.0f);
static cXyz l_offsetEyePos(24.0f, -16.0f, 0.0f);
mDoMtx_stack_c::multVec(&l_offsetAttPos, &mTargetPos);
- mDoMtx_stack_c::XrotM(mJntCtrl.getHead_y());
- mDoMtx_stack_c::ZrotM(mJntCtrl.getHead_x());
+ mDoMtx_stack_c::XrotM((int)mJntCtrl.getHead_y());
+ mDoMtx_stack_c::ZrotM((int)mJntCtrl.getHead_x());
mDoMtx_stack_c::multVec(&l_offsetEyePos, &mRdEyePos);
mDoMtx_stack_c::XrotM(mD1A);
mDoMtx_stack_c::ZrotM(mD1C);
mDoMtx_stack_c::YrotM(mD1E);
} else if (mJntCtrl.getBackboneJntNum() == jntNo) {
- mDoMtx_stack_c::XrotM(mJntCtrl.getBackbone_y());
- mDoMtx_stack_c::ZrotM(mJntCtrl.getBackbone_x());
+ mDoMtx_stack_c::XrotM((int)mJntCtrl.getBackbone_y());
+ mDoMtx_stack_c::ZrotM((int)mJntCtrl.getBackbone_x());
}
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
@@ -732,11 +732,11 @@ void daRd_c::setIceCollision() {
/* 0000180C-00001970 .text setAttention__6daRd_cFv */
void daRd_c::setAttention() {
cXyz attnPos(60.0f, 0.0f, 0.0f);
- cXyz eyePos(60.0f, 0.0f, 0.0f);
+ cXyz eyeballPos(60.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x0C)); // ree_atama_1 joint
mDoMtx_stack_c::multVec(&attnPos, &attention_info.position);
- mDoMtx_stack_c::multVecZero(&eyePos);
- eyePos = eyePos;
+ mDoMtx_stack_c::multVecZero(&eyeballPos);
+ eyePos = eyeballPos;
attention_info.position.y += l_HIO.m58;
eyePos.y += l_HIO.m5C;