diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-20 21:53:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-20 18:53:41 -0800 |
| commit | f6e2cbca9da5760a762aa8028d2e7a929d9ac39c (patch) | |
| tree | a873ce40971e10106bf6312d09205fda21066fd2 /src/d/actor/d_a_obj_ice_l.cpp | |
| parent | bd0c601a521fedf2b6a2e1930ca280555c808564 (diff) | |
Match d_a_obj_ice_s rideCallBack (#2977)
* Match d_a_obj_ice_s rideCallBack
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
* Fix debug regression
---------
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
Diffstat (limited to 'src/d/actor/d_a_obj_ice_l.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_ice_l.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index c210405bc5..3e390e98d4 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -67,10 +67,11 @@ void daObjIce_l_c::setBaseMtx() { } static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { + (void)param_0; + daObjIce_l_c* ice_p = (daObjIce_l_c*)param_1; daPy_py_c* player_p = daPy_getPlayerActorClass(); cXyz* ball_pos = player_p->getIronBallCenterPos(); cXyz& player_pos = fopAcM_GetPosition(player_p); - daObjIce_l_c* ice_p = static_cast<daObjIce_l_c*>(param_1); //!@bug Missing parentheses causes this comparison to always evaluate to false if (!fopAcM_GetName(param_2) == PROC_ALINK) { @@ -81,7 +82,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 ice_p->Check_RideOn(player_pos); } - cXyz* ice_pos = &fopAcM_GetPosition(ice_p); + cXyz* ice_pos = &fopAcM_GetPosition(param_1); if (ball_pos != NULL && ice_pos != NULL && ice_pos->absXZ(*ball_pos) < ice_p->field_0x5b4.x * 600.0f) { |