mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

scannon / scannon_crs / scannon_ten done (#2632)

Browse Source 
* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
This commit is contained in:
TakaRikka
2025-09-08 02:01:20 -07:00
committed by GitHub
parent b35204b0c8
commit 5fce8ea1e1
244 changed files with 3067 additions and 3159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_wdStick.cpp
+10 -10
View File
@@ -80,7 +80,7 @@ int daWdStick_c::create() {
mSph2.Set(mCcDSph);
mSph2.SetStts(&mStts);
fopAcM_OnCarryType(this, fopAcM_CARRY_UNK_30);
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
attention_info.distances[4] = 59;
misCarrying = fopAcM_checkCarryNow(this);
mode_init_wait();
@@ -214,7 +214,7 @@ int daWdStick_c::Execute() {
OS_REPORT("=== 木の棒再セット (%f) ===\n", current.pos.y - home.pos.y);
field_0xaac = 0;
field_0xaad = 0;
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
current.pos = home.pos;
mode_init_wait();
}
@@ -321,7 +321,7 @@ void daWdStick_c::mode_proc_call() {
/* 80D3350C-80D3353C 001AAC 0030+00 4/4 0/0 0/0 .text mode_init_wait__11daWdStick_cFv */
void daWdStick_c::mode_init_wait() {
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
speedF = 0.0f;
gravity = -10.0f;
mMode = MODE_WAIT;
@@ -336,7 +336,7 @@ void daWdStick_c::mode_proc_wait() {
/* 80D33588-80D335AC 001B28 0024+00 1/1 0/0 0/0 .text mode_init_carry__11daWdStick_cFv */
void daWdStick_c::mode_init_carry() {
cLib_offBit(attention_info.flags, 0x10UL);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
speedF = 0.0f;
mMode = MODE_CARRY;
}
@@ -393,7 +393,7 @@ void daWdStick_c::mode_proc_carry() {
/* 80D3386C-80D33890 001E0C 0024+00 1/1 0/0 0/0 .text mode_init_drop__11daWdStick_cFv */
void daWdStick_c::mode_init_drop() {
cLib_offBit(attention_info.flags, 0x10UL);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
gravity = -5.0f;
mMode = MODE_DROP;
}
@@ -407,7 +407,7 @@ void daWdStick_c::mode_proc_drop() {
/* 80D338DC-80D338F4 001E7C 0018+00 2/2 0/0 0/0 .text mode_init_roll__11daWdStick_cFv */
void daWdStick_c::mode_init_roll() {
cLib_offBit(attention_info.flags, 0x10UL);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
mMode = MODE_ROLL;
}
@@ -455,7 +455,7 @@ void daWdStick_c::mode_proc_roll() {
mode_init_wait();
}
} else {
cLib_offBit(attention_info.flags, 0x10UL);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
}
mAcch.CrrPos(dComIfG_Bgsp());
bgCheck();
@@ -472,7 +472,7 @@ BOOL daWdStick_c::chkWaterLineIn() {
void daWdStick_c::mode_init_sink() {
field_0xab0 = 0;
field_0xaae = 0;
cLib_offBit(attention_info.flags, 0x10UL);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
mMode = MODE_SINK;
}
@@ -491,12 +491,12 @@ void daWdStick_c::mode_proc_sink() {
fopAcM_posMoveF(this, mStts.GetCCMoveP());
f32 waterHeight = mAcch.m_wtr.GetHeight();
if (current.pos.y < waterHeight + 100.0f) {
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
current.pos = home.pos;
mode_init_wait();
}
if (mAcch.ChkGroundHit()) {
cLib_onBit(attention_info.flags, 0x10UL);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
}
}