diff options
| author | Max Roncace <me@caseif.net> | 2026-02-28 15:13:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 12:13:57 -0800 |
| commit | ebe7c7aabc32e0842aaaf1c5cf1ab6cf5737417f (patch) | |
| tree | 25fb02da5b81be6ed97f3eccc2964a076d49daf4 /src/d/actor/d_a_obj_lv6swturn.cpp | |
| parent | c900a043b89786d5e594ec883d9acd92e0db6bc7 (diff) | |
ShieldD: Clean up a bunch of 99% matching TUs (#3113)
* d_a_npc_ks debug code 100%
* d_a_npc_rafrel debug code 100%
* d_a_npc_inko minor improvements
* d_a_npc_gro debug code 100%
* d_a_npc_pachi_taro debug code 100%
* d_a_npc_passer debug code 100%
* d_a_npc_pachi_maro debug code 100%
* d_a_npc_post debug code 100%
* d_a_obj_bemos debug improvements
* d_a_obj_scannon_ten debug code 100%
* d_a_b_mgn debug code 100%
* d_a_e_fb debug code 100%
* d_a_e_gb debug code 100%
* d_a_e_hz debug code 100%
* d_a_e_cr_egg debug code 100%
* d_a_e_md debug code 100%
* d_a_e_wb debug code 100%
* d_a_obj_mirror_6pole debug code 100%
* d_a_obj_spinLift debug data fixes
* d_a_obj_pdwall debug data fixes
* d_a_obj_ss_drink debug code almost matching
* d_a_obj_poFire debug code 100%
* d_a_obj_picture debug code 100%
* d_a_obj_dust debug code 100%
* d_a_obj_fallobj debug code 100%
* d_a_obj_itamato debug code almost matching
* d_a_obj_syRock debug code 100%
* d_a_obj_katatsumuri debug code 100%
* d_a_obj_wood_statue debug code 100%
* d_a_obj_lv6egate debug code 100%
* d_a_tag_qs minor debug symbol fixes
* d_a_obj_twGate debug code 100%
* d_a_obj_lv6SwGate debug code 100%
* d_a_obj_lv6swturn debug code 100%
* d_a_obj_lv6Tenbin debug code 100%
* d_a_obj_kwheel01 debug code 100%
* Fix RTTI order regression (cM3dGCyl vs cBgS_*)
Diffstat (limited to 'src/d/actor/d_a_obj_lv6swturn.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_lv6swturn.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index f037e8aff4..c3fec295ae 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -10,6 +10,8 @@ #include "d/actor/d_a_obj_lv6swturn.h" #include "d/actor/d_a_player.h" +static char* l_arcName = "Obj_l6tsw"; + #if DEBUG daObjLv6SwTurn_HIO_c::daObjLv6SwTurn_HIO_c() { mWaitTime = 0x2f; @@ -30,6 +32,7 @@ void daObjLv6SwTurn_HIO_c::genMessage(JORMContext* context) { static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_2, dBgW_Base::PushPullLabel pushPull) { + static const int pp_field = 3; UNUSED(param_2); dBgW_Base::PushPullLabel pushPull_3 = cLib_checkBit(pushPull, dBgW_Base::PPLABEL_3); daObjLv6SwTurn_c* swTurnActor1 = (daObjLv6SwTurn_c*)actor1; @@ -57,8 +60,6 @@ static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_ return actor1; } -static char* l_arcName = "Obj_l6tsw"; - void daObjLv6SwTurn_c::initBaseMtx() { unk5A8->setBaseScale(scale); setBaseMtx(); @@ -135,20 +136,11 @@ enum daObjLv6SwTurn_c_mode{ void daObjLv6SwTurn_c::mode_proc_call() { typedef void (daObjLv6SwTurn_c::*func_type)(); - // naming difference between debug and release -#if DEBUG - static func_type mode_proc_call[] = { - &daObjLv6SwTurn_c::modeWait, - &daObjLv6SwTurn_c::modeRotate - }; - (this->*mode_proc_call[mMode])(); -#else static func_type l_func[] = { &daObjLv6SwTurn_c::modeWait, &daObjLv6SwTurn_c::modeRotate }; (this->*l_func[mMode])(); -#endif } void daObjLv6SwTurn_c::init_modeWait() { @@ -312,7 +304,7 @@ int daObjLv6SwTurn_c::Draw() { dComIfGd_setList(); #if DEBUG if (l_HIO.mDrawFlag) { - mpBgW->GetAttackThrough(0); + mpBgW->DebugDraw(); } #endif return TRUE; |