From e1f3d5ce93f4aabd642414395e883a51a5bc6104 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:48:05 -0400
Subject: [PATCH] fix some regressions

---
 src/d/actor/d_a_item.cpp |  6 +++---
 src/d/actor/d_a_rd.cpp   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 93ff17599..463ec2dbd 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1235,13 +1235,13 @@ void daItem_c::mode_water_init() {
     clrFlag(FLAG_UNK04);
     scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
     
-    cXyz scale;
+    cXyz particleScale;
     f32 temp = dItem_data::getShadowSize(m_itemNo);
     f32 temp3 = temp / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
     temp3 *= scale.x;
-    scale.setall(temp3);
+    particleScale.setall(temp3);
     
-    dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &scale, 0xFF, &mPtclRippleCb);
+    dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
     mPtclRippleCb.mRate = 0.0f;
 }
 
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index d75549d60..bd6b57e16 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;