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_e_ms.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_e_ms.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_ms.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index b8595f2ce5..a70515fe13 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -67,7 +67,7 @@ static int daE_MS_Draw(e_ms_class* i_this) { cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z); i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &shadow_pos, 400.0f, 40.0f, - i_this->current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd, + i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; @@ -79,7 +79,7 @@ static void sibuki_set(e_ms_class* i_this) { cXyz pos(i_this->current.pos); pos.y = i_this->field_0x690; fopKyM_createWpillar(&pos, 1.0f, 0); - if (i_this->field_0x690 - i_this->mAcch.m_ground_h > 50.0f) { + if (i_this->field_0x690 - i_this->mAcch.GetGroundH() > 50.0f) { i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1); } else { i_this->mSound.startCreatureSound(Z2SE_EN_MS_FALLWATER, 0, -1); @@ -108,7 +108,6 @@ static void ms_disappear(e_ms_class* i_this) { } } -/* 807297FD 0003+00 data_807297FD None */ static u8 hio_set; static daE_MS_HIO_c l_HIO; @@ -1062,7 +1061,7 @@ static actor_method_class l_daE_MS_Method = { (process_method_func)daE_MS_Draw, }; -extern actor_process_profile_definition g_profile_E_MS = { +actor_process_profile_definition g_profile_E_MS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio |