diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-23 18:53:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-23 15:53:10 -0800 |
| commit | 877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 (patch) | |
| tree | 154eddaea39971210e088cb828f80d38b998f998 /src/d/actor/d_a_obj_stone.cpp | |
| parent | 6ef13c620a46aed5fea525699a4832a1ad6e4d1f (diff) | |
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps
* Fix ifdef
* Fix bad JSystem pch ifdef breaking decomp.me
* Remove Acch Chk fakematches
* Private Acch fields
* Fix some clangd errors in headers
* Add UNUSED macro for matching debug parameters
* Enable clangd unused-parameter warning
* Remove extern from initializers
Probably added by dol2asm?
* Fix process profile definitions
* Remove leftover dol2asm address comments
* Remove some unnecessary double casts
* Enable some more clangd warnings
* Fix missing usages of fopAcM_ct
* Fix wrong enum usage
* Fix more fakematches
Diffstat (limited to 'src/d/actor/d_a_obj_stone.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_stone.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 36ff9973b6..bea118ce80 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -318,11 +318,11 @@ void daObjStone_c::mode_proc_call() { if (mCollider.ChkAtHit()) { init_modeBreak(); } - bool isGroundLanding = mChkObj.ChkGroundLanding() != 0; - u32 isWallhit = mChkObj.m_flags & dBgS_Acch::WALL_HIT; - bool isGroundHit = mChkObj.ChkGroundHit() != 0; - bool isWaterHit = mChkObj.ChkWaterHit() != 0; - bool isWaterIn = mChkObj.ChkWaterIn() != 0; + bool isGroundLanding = mChkObj.ChkGroundLanding(); + u32 isWallhit = mChkObj.ChkWallHit(); + bool isGroundHit = mChkObj.ChkGroundHit(); + bool isWaterHit = mChkObj.ChkWaterHit(); + bool isWaterIn = mChkObj.ChkWaterIn(); if (field_0x0907 == 1) { if (isGroundLanding && !isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); @@ -336,7 +336,7 @@ void daObjStone_c::mode_proc_call() { speedF = speed.absXZ(); current.angle.y = cM_atan2s(speed.x, speed.z); } else { - if (isWallhit && field_0x0951 == 0 && isWaterIn) { + if (isWallhit && !field_0x0951 && isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); speed.z = speedF * cM_scos(current.angle.y); speed.y = mLastSpeedY; @@ -489,7 +489,7 @@ void daObjStone_c::mode_proc_call() { } (this->*(l_func[field_0x0907]))(); CrrPos(); - field_0x0951 = isWallhit != 0; + field_0x0951 = isWallhit; } void daObjStone_c::init_modePutWait() { @@ -1022,7 +1022,7 @@ static actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stone = { +actor_process_profile_definition g_profile_Obj_Stone = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio |