diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-10 21:25:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-10 18:25:00 -0800 |
| commit | 23a1c940630435eaa0bbca45fb24156fc0d3db62 (patch) | |
| tree | c2b05e860562425bd3147046e19bcf8130ad4625 /src/d/actor/d_a_obj_bosswarp.cpp | |
| parent | a02f72d8f3a87a2d2ddde062301d3639050e1e35 (diff) | |
Regalloc/debug/misc fixes (#2794)
* Fix "0" asserts
* More debug and regalloc fixes
* Fix PTMF syntax for compatibility with other compilers
* Fix some fakematches, link more TUs for J/P
Diffstat (limited to 'src/d/actor/d_a_obj_bosswarp.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_bosswarp.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 3d9f4bf613..89c97ab704 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -315,17 +315,17 @@ int daObjBossWarp_c::execute() { void daObjBossWarp_c::event_proc_call() { typedef void (daObjBossWarp_c::*daObjBossWarp_action)(); static daObjBossWarp_action l_func[11] = { - &actionWait, - &actionOrderEvent, - &actionEvent, - &actionWaitWarp, - &actionOrderWarpEvent, - &actionWarpEvent, - &actionDead, - &actionOrderChkEvent, - &actionChkEvent, - &actionOrderCancelEvent, - &actionCancelEvent, + &daObjBossWarp_c::actionWait, + &daObjBossWarp_c::actionOrderEvent, + &daObjBossWarp_c::actionEvent, + &daObjBossWarp_c::actionWaitWarp, + &daObjBossWarp_c::actionOrderWarpEvent, + &daObjBossWarp_c::actionWarpEvent, + &daObjBossWarp_c::actionDead, + &daObjBossWarp_c::actionOrderChkEvent, + &daObjBossWarp_c::actionChkEvent, + &daObjBossWarp_c::actionOrderCancelEvent, + &daObjBossWarp_c::actionCancelEvent, }; (this->*l_func[mAction])(); } @@ -494,7 +494,7 @@ int daObjBossWarp_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(mStaffId)) { switch (act_idx) { - case 0: // WAIT + case 0: { // WAIT int* timer = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); if (timer == NULL) { mTimer = 1; @@ -502,13 +502,15 @@ int daObjBossWarp_c::demoProc() { mTimer = *timer; } break; - case 1: // APPEAR + } + case 1: { // APPEAR int level = getNowLevel(); if (level >= 0 && level < 10 && l_dangeon_clr_bitNo[level] > 0) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[l_dangeon_clr_bitNo[level]]); } appear(0); break; + } case 2: // DISAPPEAR disappear(0); break; |