diff options
| author | roeming <brother64youyou@gmail.com> | 2025-12-18 16:31:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-18 13:31:44 -0800 |
| commit | 93067110f6bf969776a553ddbefe6a734504f7d6 (patch) | |
| tree | 0d2d421527c4cb8516d994ec5978195b55fdc234 /src/d | |
| parent | 7cae156176b03d79ef05f3fefae5b60844e0fdf7 (diff) | |
Use consistent s32/u32 (#2964)
* cleanup long usage
* fix regression
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/actor/d_a_obj_ice_s.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index ba32890870..95c74a38c2 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -124,7 +124,7 @@ 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 = (cXyz*)&fopAcM_GetPosition(player); cXyz* pBallCenter = player->getIronBallCenterPos(); // !@bug misplaced ! operator. This condition is probably always false @@ -138,7 +138,9 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 } cXyz* icePos = (cXyz*)&fopAcM_GetPosition(param_2); - if (pBallCenter != NULL && icePos != NULL && icePos->absXZ(*pBallCenter) < ice->field_0x5c8.x * 600.0f) { + if (pBallCenter != NULL && icePos != NULL && + icePos->absXZ(*pBallCenter) < ice->field_0x5c8.x * 600.0f) + { ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; @@ -150,9 +152,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5ac = 0x1000; ice->Check_RideOn(*playerPos); } - if (ice->field_0x5c5 == 0xff && - fopAcM_GetName(param_3) == PROC_ALINK) - { + if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == PROC_ALINK) { ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; |