encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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 10:37:46 -07:00
committed by GitHub
parent 2453c0e333
commit 6e94efaefb
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_nbomb.cpp
+8 -8
View File
@@ -937,7 +937,7 @@ BOOL daNbomb_c::procWait() {
f32 prev_speedf = speedF;
if (mAcch.i_ChkGroundHit() && !mAcch.ChkGroundLanding()) {
if (mAcch.ChkGroundHit() && !mAcch.ChkGroundLanding()) {
s16 var_r28 = fopAcM_getPolygonAngle(mAcch.m_gnd, current.angle.y);
speed.y -= speedF * fabsf(cM_ssin(var_r28));
@@ -1009,12 +1009,12 @@ BOOL daNbomb_c::procWait() {
setRoomInfo();
if (checkStateFlg0(FLG0_INSECT_BOMB) &&
(mAcch.i_ChkGroundHit() || mAcch.ChkWallHit() || mAcch.ChkRoofHit()))
(mAcch.ChkGroundHit() || mAcch.ChkWallHit() || mAcch.ChkRoofHit()))
{
return procExplodeInit();
}
if (mAcch.i_ChkGroundHit()) {
if (mAcch.ChkGroundHit()) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &plane);
@@ -1047,7 +1047,7 @@ BOOL daNbomb_c::procWait() {
speedF *= player->getBombBoundRate();
current.angle.y = (var_r27 * 2) - (current.angle.y + 0x8000);
mAcch.ClrGroundLanding();
mAcch.i_ClrGroundHit();
mAcch.ClrGroundHit();
speed.y = prev_speedY;
}
}
@@ -1083,7 +1083,7 @@ BOOL daNbomb_c::procWait() {
}
fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_BOUND, 0);
} else if (mAcch.i_ChkGroundHit()) {
} else if (mAcch.ChkGroundHit()) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &plane);
@@ -1275,7 +1275,7 @@ BOOL daNbomb_c::procInsectMove() {
speed.y = field_0xbfc.y;
speedF = field_0xbfc.absXZ();
current.angle.y = field_0xbfc.atan2sX_Z();
mAcch.i_ClrGroundHit();
mAcch.ClrGroundHit();
mAcch.ClrWallHit();
mAcch.ClrRoofHit();
mAcch.ClrRoofNone();
@@ -1450,7 +1450,7 @@ int daNbomb_c::execute() {
}
if ((mAcch.ChkWallHit() && daAlink_c::checkIcePolygonDamage(&mAcchCir)) ||
(mAcch.i_ChkGroundHit() && daAlink_c::checkIcePolygonDamage(&mAcch.m_gnd)) ||
(mAcch.ChkGroundHit() && daAlink_c::checkIcePolygonDamage(&mAcch.m_gnd)) ||
(mAcch.ChkRoofHit() && daAlink_c::checkIcePolygonDamage(&mAcch.m_roof)))
{
setFreeze();
@@ -1547,7 +1547,7 @@ int daNbomb_c::execute() {
var_f27 = speedF;
temp_r3 = current.angle.y;
if (mAcch.i_ChkGroundHit()) {
if (mAcch.ChkGroundHit()) {
var_r27 = 0;
}
}