diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2026-03-18 02:57:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-18 02:57:37 -0700 |
| commit | bc7503cb70fff0dfcea72c4df0ddc3e492e6b160 (patch) | |
| tree | 83387b95f5df062b723fa4c8bb7a771ca867a384 /src/d/actor/d_a_obj_iceblock.cpp | |
| parent | f64015ea383cc3ba93a90918ac3dd1d2f66e1e17 (diff) | |
fix push pull callback UB in other compilers (#3134)
Diffstat (limited to 'src/d/actor/d_a_obj_iceblock.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_iceblock.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 439864dc8e..6fc06f4860 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -25,7 +25,7 @@ enum WALK_TYPE { WALK_IRON_BALL_HIT, }; -void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle, +fopAc_ac_c* daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle, dBgW_Base::PushPullLabel i_label) { bool temp_r3 = cLib_checkBit<u8>(i_label, dBgW::PPLABEL_PUSH) != 0; bool temp_r3_2 = cLib_checkBit<u8>(i_label, dBgW::PPLABEL_PUSH) != 0; @@ -54,6 +54,7 @@ void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s } ((daObjIceBlk_c*)i_bgActor)->mPPLabel = i_label; + return i_bgActor; } static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { |