diff options
| author | roeming <brother64youyou@gmail.com> | 2026-02-20 05:48:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-20 02:48:29 -0800 |
| commit | 0558bde1e61374f5a1b54453f07fe6cc15525bc1 (patch) | |
| tree | c1ba397dbde72c71a58a0f15e895aad540b25768 /src/d/actor/d_a_obj_chandelier.cpp | |
| parent | 95c3626771d589bb8323eb81cf740ecd23e379b5 (diff) | |
Big cast cleanup (#3076)
* Big cast cleanup
* fix for name conflict
* rename header
* rename cast macros
* fix rename mistake
---------
Co-authored-by: roeming <roeming@users.noreply.github.com>
Diffstat (limited to 'src/d/actor/d_a_obj_chandelier.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_chandelier.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index bdcf4b1983..ff512a87eb 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -182,8 +182,8 @@ void daObjChandelier_c::setModelMtx() { void daObjChandelier_c::moveSwing(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { f32 f1 = -param_1 + param_0 * field_0x5fc; - shape_angle.z += (s16)(field_0x608 * (f1 * field_0x5ec)); - shape_angle.y += (s16)(field_0x608 * field_0x604 * field_0x5ec); + ANGLE_ADD(shape_angle.z, field_0x608 * (f1 * field_0x5ec)); + ANGLE_ADD(shape_angle.y, field_0x608 * field_0x604 * field_0x5ec); if (f1 > param_1) { field_0x5fc = 0; field_0x608 *= -1; @@ -209,7 +209,7 @@ void daObjChandelier_c::moveSwingFall() { cLib_chaseF(&field_0x5ec, 0.0f, 0.04f); field_0x608 *= -1; shape_angle.z = field_0x608 * 50.0f * field_0x5ec; - shape_angle.y += (s16)cM_rndFX(50.0f); + ANGLE_ADD(shape_angle.y, cM_rndFX(50.0f)); cXyz vec1 = field_0x5a8; mDoMtx_stack_c::transS(vec1); mDoMtx_stack_c::ZXYrotM(shape_angle); |