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>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp
index c2e8e6e8ab..57e374dc9f 100644
--- a/src/d/actor/d_a_obj_pumpkin.cpp
+++ b/src/d/actor/d_a_obj_pumpkin.cpp
@@ -450,7 +450,7 @@ int daObj_Pumpkin_c::Execute() {
                                     current.angle.y = cM_atan2s(sp_0x4C.x, sp_0x4C.z);
                                 }
 
-                                MULT_ANGLE_2(sp_0x10, streamPower);
+                                ANGLE_MULT_2(sp_0x10, streamPower);
                                 cLib_chaseAngleS(&field_0xB38.y, (field_0xB38.y < 0) ? sp_0x10*-1 : sp_0x10, 0x10);
                                 if (field_0xBAB) {
                                     cLib_addCalc2(&speedF, streamPower * 1.55f, 0.15f, 1.0f);