mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-20 06:41:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_carry mostly done (#2301)

Browse Source 
* d_a_obj_carry mostly done

* cleanup some acch inlines
This commit is contained in:
TakaRikka
2025-02-13 09:37:46 -08:00
committed by GitHub
parent eda175afc8
commit dc32cbd7e6
63 changed files with 4556 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_item.cpp
+4 -4
View File
@@ -244,7 +244,7 @@ void daItem_c::CreateInit() {
speed = old_speed;
mAcch.ClrGroundLanding();
mAcch.i_ClrGroundHit();
mAcch.ClrGroundHit();
mAcch.ClrWaterHit();
mAcch.ClrWaterIn();
mAcch.ClrWallHit();
@@ -726,7 +726,7 @@ void daItem_c::move_proc_call() {
}
bool update_pos = true;
if (mAcch.i_ChkGroundHit() && !mAcch.ChkGroundLanding() && !mAcch.ChkWallHit() &&
if (mAcch.ChkGroundHit() && !mAcch.ChkGroundLanding() && !mAcch.ChkWallHit() &&
!dComIfG_Bgsp().ChkMoveBG_NoDABg(mAcch.m_gnd) && !mCcCyl.ChkCoHit() &&
mLastPos == current.pos)
{
@@ -1040,7 +1040,7 @@ int daItem_c::itemActionForHeart() {
mAcch.CrrPos(dComIfG_Bgsp());
if (mAcch.ChkGroundLanding() || mAcch.i_ChkGroundHit()) {
if (mAcch.ChkGroundLanding() || mAcch.ChkGroundHit()) {
clrFlag(FLAG_UNK_2_e);
shape_angle.z = 0;
fopAcM_SetSpeed(this, 0.0f, -1.0f, 0.0f);
@@ -1059,7 +1059,7 @@ int daItem_c::itemActionForArrow() {
mAcch.CrrPos(dComIfG_Bgsp());
bg_check();
if (mAcch.i_ChkGroundHit() && !mAcch.ChkGroundLanding()) {
if (mAcch.ChkGroundHit() && !mAcch.ChkGroundLanding()) {
fopAcM_SetSpeedF(this, 0.0f);
RotateYBase();
}