mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-23 15:25:19 -04:00
scannon / scannon_crs / scannon_ten done (#2632)
* scannon done * scannon_crs done * scannon_ten done * pr * attention debug stuff * attn flags * fix build
This commit is contained in:
@@ -216,7 +216,7 @@ int daObjStone_c::Create() {
|
||||
}
|
||||
|
||||
fopAcM_setCullSizeSphere(this, 0.0f, 0.0f, 0.0f, l_r[mStoneType] * 1.2f);
|
||||
cLib_onBit<u32>(attention_info.flags, 0x10);
|
||||
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
attention_info.distances[fopAc_attn_CARRY_e] = 0x2A;
|
||||
fopAcM_OnCarryType(this, fopAcM_CARRY_LIGHT);
|
||||
|
||||
@@ -530,7 +530,7 @@ void daObjStone_c::mode_proc_call() {
|
||||
void daObjStone_c::init_modePutWait() {
|
||||
mCollider.OffAtSPrmBit(1);
|
||||
mCollider.OnCoSPrmBit(1);
|
||||
cLib_onBit<u32>(attention_info.flags, 0x10);
|
||||
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
mInitialOffsetY = l_initial_offsetY[mStoneType];
|
||||
mMode = 0;
|
||||
field_0x0907 = 3;
|
||||
@@ -545,7 +545,7 @@ void daObjStone_c::modePutWait() {
|
||||
void daObjStone_c::init_modeWait() {
|
||||
mCollider.OffAtSPrmBit(1);
|
||||
mCollider.OnCoSPrmBit(1);
|
||||
cLib_onBit<u32>(attention_info.flags, 0x10);
|
||||
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
mMode = 0;
|
||||
field_0x0907 = 0;
|
||||
}
|
||||
@@ -567,7 +567,7 @@ void daObjStone_c::modeWait() {
|
||||
void daObjStone_c::init_modeDrop() {
|
||||
mCollider.OnAtSPrmBit(1);
|
||||
mCollider.OnCoSPrmBit(1);
|
||||
cLib_offBit<u32>(attention_info.flags, 0x10);
|
||||
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
mMode = 0;
|
||||
mLastPosY = current.pos.y;
|
||||
field_0x0907 = 1;
|
||||
@@ -581,8 +581,8 @@ void daObjStone_c::modeDrop() {
|
||||
|
||||
if (mIsInWater != 0) {
|
||||
mCollider.OffAtSPrmBit(1);
|
||||
mChkObj.ChkGroundHit() ? cLib_onBit<u32>(attention_info.flags, 0x10) :
|
||||
cLib_offBit<u32>(attention_info.flags, 0x10);
|
||||
mChkObj.ChkGroundHit() ? cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e) :
|
||||
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
|
||||
pos2.x = speedF * cM_ssin(current.angle.y);
|
||||
pos2.y = speed.y;
|
||||
@@ -693,7 +693,7 @@ void daObjStone_c::modeCarry() {
|
||||
void daObjStone_c::init_modeWalk() {
|
||||
mCollider.OffAtSPrmBit(1);
|
||||
mCollider.OnCoSPrmBit(1);
|
||||
cLib_onBit<u32>(attention_info.flags, 0x10);
|
||||
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
|
||||
mMode = 0;
|
||||
field_0x0907 = 4;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user