diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-09-08 02:01:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-08 12:01:20 +0300 |
| commit | 52aa5f677f722f14f10298a3ebe1e355a4c26938 (patch) | |
| tree | 583eb03de69d9a2232be573fd4fe5f4e5380e417 /src/d/actor/d_a_obj_kantera.cpp | |
| parent | cbe5aaca8f2cb2e5046166b79a46de1e97f82730 (diff) | |
scannon / scannon_crs / scannon_ten done (#2632)
* scannon done
* scannon_crs done
* scannon_ten done
* pr
* attention debug stuff
* attn flags
* fix build
Diffstat (limited to 'src/d/actor/d_a_obj_kantera.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_kantera.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index d3235b1085..c79d38144f 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -150,7 +150,7 @@ int daItemKantera_c::actionInit() { int daItemKantera_c::actionWaitInit() { mCcCyl.OffTgSPrmBit(1); mCcCyl.OffCoSPrmBit(1); - cLib_offBit<u32>(attention_info.flags, 0x10); + cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); attention_info.distances[fopAc_attn_CARRY_e] = 16; attention_info.position = current.pos; show(); @@ -164,23 +164,23 @@ int daItemKantera_c::actionWait() { mAcch.CrrPos(dComIfG_Bgsp()); bg_check(); if (mAcch.ChkGroundHit()) { - cLib_onBit(attention_info.flags, 0x10UL); + cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); speedF *= 0.9f; if (speedF < 1.0f) { speedF = 0.0f; } } else { - cLib_offBit(attention_info.flags, 0x10UL); + cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); } daPy_py_c* player = daPy_getPlayerActorClass(); if (fopAcM_checkCarryNow(this)) { - cLib_offBit(attention_info.flags, 0x10UL); + cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); if (player->getGrabUpStart()) { fopAcM_cancelCarryNow(this); initActionOrderGetDemo(); } } else { - cLib_onBit(attention_info.flags, 0x10UL); + cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); } attention_info.position = current.pos; return 1; @@ -189,7 +189,7 @@ int daItemKantera_c::actionWait() { /* 80C39234-80C392D0 000C34 009C+00 1/1 0/0 0/0 .text initActionOrderGetDemo__15daItemKantera_cFv */ int daItemKantera_c::initActionOrderGetDemo() { - cLib_offBit<u32>(attention_info.flags, 0x10); + cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e); mCcCyl.OffTgSPrmBit(1); mCcCyl.OffCoSPrmBit(1); hide(); |