diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-21 18:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-21 15:52:16 -0800 |
| commit | e2fddadf320e8d35cbb3542645122e086efbfe9f (patch) | |
| tree | f0e11b2955fd092ad3022c192aed36bddd77fb48 /src/d/actor/d_a_obj_ice_s.cpp | |
| parent | 31621c3daccccc0a582eceafec7e373d872f072a (diff) | |
Misc matches (#2845)
* Misc debug matches
* Fix d_map weak function order
* Remove old nonmatching comments
* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment
* More misc matches
Diffstat (limited to 'src/d/actor/d_a_obj_ice_s.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_ice_s.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index eb44abe2a1..165a02cf12 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -106,13 +106,12 @@ void daObjIce_s_c::setBaseMtx() { /* 80C20F48-80C21234 000688 02EC+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ - // NONMATCHING - // reg alloc +// NONMATCHING - regalloc, equivalent static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { (void)param_1; daObjIce_s_c* ice = (daObjIce_s_c*)param_2; daPy_py_c* player = daPy_getPlayerActorClass(); - cXyz& playerPos = fopAcM_GetPosition(player); + cXyz* playerPos = &fopAcM_GetPosition(player); cXyz* pBallCenter = player->getIronBallCenterPos(); // !@bug misplaced ! operator. This condition is probably always false @@ -122,10 +121,10 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5ac = 0x500; } else { ice->field_0x5a4 = -1.3f; - ice->Check_LinkRideOn(playerPos); + ice->Check_LinkRideOn(*playerPos); } - cXyz* icePos = &fopAcM_GetPosition(param_2); + cXyz* icePos = (cXyz*)&fopAcM_GetPosition(param_2); if (pBallCenter != NULL && icePos != NULL && icePos->absXZ(*pBallCenter) < ice->field_0x5c8.x * 600.0f) { ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; @@ -136,7 +135,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; - ice->Check_RideOn(playerPos); + ice->Check_RideOn(*playerPos); } if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == PROC_ALINK) @@ -144,7 +143,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; - ice->Check_RideOn(playerPos); + ice->Check_RideOn(*playerPos); } } |