mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Big cast cleanup (#3076)

Browse Source 
* Big cast cleanup

* fix for name conflict

* rename header

* rename cast macros

* fix rename mistake

---------

Co-authored-by: roeming <roeming@users.noreply.github.com>
This commit is contained in:
roeming
2026-02-20 05:48:29 -05:00
committed by GitHub
parent 979afc7c59
commit 07ef4b6d26
138 changed files with 516 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_carry.cpp
+7 -6
View File
@@ -3917,8 +3917,8 @@ void daObjCarry_c::calc_rot_axis_tsubo() {
mDoMtx_stack_c::YrotS(current.angle.y);
mDoMtx_stack_c::multVec(&mRotAxis, &mRotAxis);
}
mRotation += (s16)(((0.5f * field_0xd70) + data().m_urnRotateFactor) * (std::fabs(speedF) + std::fabs(speed.y)));
ANGLE_ADD(mRotation, ((0.5f * field_0xd70) + data().m_urnRotateFactor) *
(std::fabs(speedF) + std::fabs(speed.y)));
break;
case 3:
sp20 = current.pos - old.pos;
@@ -3930,8 +3930,8 @@ void daObjCarry_c::calc_rot_axis_tsubo() {
mDoMtx_stack_c::multVec(&mRotAxis, &mRotAxis);
}
}
mRotation += (s16)(((0.5f * field_0xd70) + data().m_urnRotateFactor) * (std::fabs(speedF) + std::fabs(speed.y)));
ANGLE_ADD(mRotation, ((0.5f * field_0xd70) + data().m_urnRotateFactor) *
(std::fabs(speedF) + std::fabs(speed.y)));
break;
}
}
@@ -3951,7 +3951,7 @@ void daObjCarry_c::calc_rot_axis_kibako() {
cXyz sp8 = current.pos - old.pos;
if (mMode == MODE_DROP) {
mRotation += (s16)(speedF * ((field_0xd70 * 0.5f) + data().m_urnRotateFactor));
ANGLE_ADD(mRotation, speedF * ((field_0xd70 * 0.5f) + data().m_urnRotateFactor));
} else {
mRotation = 0;
}
@@ -3984,7 +3984,8 @@ void daObjCarry_c::calc_rot_axis_bokkuri() {
mDoMtx_stack_c::multVec(&mRotAxis, &mRotAxis);
}
mRotation += (s16)(((0.5f * field_0xd70) + data().m_urnRotateFactor) * (std::fabs(speedF) + std::fabs(speed.y)));
ANGLE_ADD(mRotation, ((0.5f * field_0xd70) + data().m_urnRotateFactor) *
(std::fabs(speedF) + std::fabs(speed.y)));
}
} else if (mMode == MODE_WALK || mMode == MODE_WAIT) {
mRotAxis = cXyz::Zero;