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_volcbom.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_volcbom.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_volcbom.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 6280b5a703..7711aefa25 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -598,15 +598,13 @@ void daObjVolcBom_c::actionWait() { } daMidna_c* midna = daPy_py_c::getMidnaActor(); - daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass(); + daPy_py_c* player = daPy_getPlayerActorClass(); - // Probably fake match since ebug calls different manager functions - dEvent_manager_c& evtMgr = g_dComIfG_gameInfo.play.getEvtManager(); - if (evtMgr.startCheck(mEventId)) { - if (strcmp(evtMgr.getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { + if (dComIfGp_evmng_startCheck(mEventId)) { + if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { player->onWarpObjDemo(); dComIfGp_getEvent().setPt2(this); - mStaffId = evtMgr.getMyStaffId(l_staff_name, 0, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); setAction(ACTION_WARP_EVENT); demoProc(); } @@ -882,7 +880,7 @@ static actor_method_class daObjVolcBom_METHODS = { (process_method_func)daObjVolcBom_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { +actor_process_profile_definition g_profile_Obj_VolcanicBomb = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio |