diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index ff858d70..5ab7184c 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -911,8 +911,8 @@ public: return true; } /* vt 0x2EC */ virtual void isOnClawTargetMaybe(s32 arm, mAng &a1, mAng &a2) { - a1.setR(0); - a2.setR(0); + a1 = 0; + a2 = 0; } /* vt 0x2F0 */ virtual bool isMPPose() { return false; diff --git a/include/m/m_angle.h b/include/m/m_angle.h index fd9fa6a6..32d4ac22 100644 --- a/include/m/m_angle.h +++ b/include/m/m_angle.h @@ -36,10 +36,6 @@ struct mAng { return &mVal; } - void setR(const u32 &v) { - mVal = v; - } - mAng operator-() { return mAng(-mVal); } diff --git a/src/d/d_player_mdl.cpp b/src/d/d_player_mdl.cpp index ef2a4d68..e0538fe3 100644 --- a/src/d/d_player_mdl.cpp +++ b/src/d/d_player_mdl.cpp @@ -800,9 +800,9 @@ void daPlayerModelBase_c::adjustMainModelWorldMtx(PlayerMainModelNode_e nodeId, // TODO: I'd like this to be a neat ternary... // nodeId == PLAYER_MAIN_NODE_HAND_R ? -5461 : -7282; mAng rot; - rot.setR(-7282); + rot = -7282; if (nodeId == PLAYER_MAIN_NODE_HAND_R) { - rot.setR(-5461); + rot = -5461; } applyWorldRotationMaybe(result, rot, 0, 0, nullptr, false); } else if (isOnVines()) {