mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 13:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor inline cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-03-11 18:12:15 -04:00
parent 44761305b9
commit 029ddf6bb9
19 changed files with 49 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agb.cpp
+1 -1
View File
@@ -1466,7 +1466,7 @@ void daAgb_c::modeMove() {
if (attList) {
fopAc_ac_c* r3 = attList->getActor();
if (r3) {
if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_checkStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) {
if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) {
current.pos = r3->current.pos;
home.pos = r3->current.pos;
setTargetID(attList->getPid());
src/d/actor/d_a_am2.cpp
+6 -6
View File
@@ -127,7 +127,7 @@ static BOOL daAM2_Draw(am2_class* i_this) {
i_this->mpBrkAnm->remove(model->getModelData());
i_this->mpBtkAnm->remove(model->getModelData());
if (!fopAcM_checkStatus(i_this, fopAcStts_CARRY_e)) {
if (!fopAcM_CheckStatus(i_this, fopAcStts_CARRY_e)) {
dComIfGd_setSimpleShadow2(
&i_this->current.pos, i_this->mAcch.GetGroundH(), 50.0f, i_this->mAcch.m_gnd,
0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
@@ -684,7 +684,7 @@ static void action_mahi(am2_class* i_this) {
fopAcM_seStart(actor, JA_SE_CM_AM2_JUMP, 0);
i_this->mCountUpTimers[1] = 0;
}
if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
i_this->mAcchRadius = 40.0f + g_regHIO.mChild[8].mFloatRegs[10];
i_this->mbMadeWaterSplash = false;
i_this->mRippleCb.end();
@@ -708,7 +708,7 @@ static void action_mahi(am2_class* i_this) {
if (i_this->mPickedUpYPos + 10.0f <= actor->current.pos.y) {
cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y, 1, 0x1000);
}
if (!fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
i_this->mAcchRadius = 40.0f + g_regHIO.mChild[8].mFloatRegs[10];
i_this->mBodyCyl.OnCoSetBit();
if (actor->speedF > 0.0f) {
@@ -807,7 +807,7 @@ static void action_mahi(am2_class* i_this) {
i_this->mAction = ACTION_DOUSA;
i_this->mState = 0;
if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
fopAcM_cancelCarryNow(actor);
actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
actor->gravity = -4.0f;
@@ -827,7 +827,7 @@ static void action_mahi(am2_class* i_this) {
}
if (i_this->mCountDownTimers[3] == 1) {
if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
fopAcM_cancelCarryNow(actor);
actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
}
@@ -840,7 +840,7 @@ static void action_mahi(am2_class* i_this) {
}
}
if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e) || i_this->mState == 0xF || !week_atari_check(i_this)) {
if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e) || i_this->mState == 0xF || !week_atari_check(i_this)) {
body_atari_check(i_this);
}
}
src/d/actor/d_a_hookshot.cpp
+2 -2
View File
@@ -193,7 +193,7 @@ void daHookshot_rockLineCallback(fopAc_ac_c* hookshot_actor, dCcD_GObjInf* objIn
f32 f1 = i_this->m2CC.abs2(i_this->current.pos);
if (f1 > f31) {
i_this->m2CC = *objInf->GetAtHitPosP();
if (fopAcM_checkStatus(collided_actor, fopAcStts_UNK80000_e | fopAcStts_UNK200000_e | fopAcStts_UNK10000000_e)) {
if (fopAcM_CheckStatus(collided_actor, fopAcStts_UNK80000_e | fopAcStts_UNK200000_e | fopAcStts_UNK10000000_e)) {
i_this->m2B0 = 1;
} else {
i_this->m2B0 = 0;
@@ -319,7 +319,7 @@ static BOOL daHookshot_IsDelete(daHookshot_c* i_this) {
BOOL daHookshot_c::hookshot_delete() {
if (mCarryActorID != fpcM_ERROR_PROCESS_ID_e) {
fopAc_ac_c* hooked_actor = fopAcM_SearchByID(mCarryActorID);
if (hooked_actor && fopAcM_checkStatus(hooked_actor, fopAcStts_HOOK_CARRY_e)) {
if (hooked_actor && fopAcM_CheckStatus(hooked_actor, fopAcStts_HOOK_CARRY_e)) {
fopAcM_cancelHookCarryNow(hooked_actor);
mCarryActorID = fpcM_ERROR_PROCESS_ID_e;
}
src/d/actor/d_a_item.cpp
+1 -1
View File
@@ -798,7 +798,7 @@ BOOL daItem_c::checkItemDisappear() {
if (mItemStatus == STATUS_UNK4) {
disappearing = FALSE;
}
if (checkFlag(FLAG_BOOMERANG) || checkFlag(FLAG_HOOK) || fopAcM_checkStatus(this, fopAcStts_HOOK_CARRY_e)) {
if (checkFlag(FLAG_BOOMERANG) || checkFlag(FLAG_HOOK) || fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_e)) {
disappearing = FALSE;
show();
}
src/d/actor/d_a_npc_md.cpp
+2 -2
View File
@@ -1136,7 +1136,7 @@ BOOL daNpc_Md_c::lightHitCheck() {
if (mCps.ChkAtHit()) {
fopAc_ac_c* hitActor = mCps.GetAtHitAc();
if (fopAcM_checkStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
if (fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
if (hitActor != dComIfGp_getLinkPlayer() && m3058.getEmitter() == NULL) {
dComIfGp_particle_set(0x8232, &current.pos, NULL, NULL, 0xFF, &m3058);
}
@@ -2964,7 +2964,7 @@ BOOL daNpc_Md_c::draw() {
dComIfGd_getXluList()->entryImm(&m0B70, 0x1F);
}
if (!isShipRide() && !fopAcM_checkStatus(this, fopAcStts_CARRY_e) && cLib_checkBit(m30F0, 0x20000UL)) {
if (!isShipRide() && !fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && cLib_checkBit(m30F0, 0x20000UL)) {
cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
mShadowId = dComIfGd_setShadow(
mShadowId, 0, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
src/d/actor/d_a_player_npc.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ BOOL daPy_npc_c::checkNowPosMove(const char* pName) {
return TRUE;
}
return fopAcM_checkStatus(this, fopAcStts_UNK800_e);
return fopAcM_CheckStatus(this, fopAcStts_UNK800_e);
}
/* 8015AC74-8015AD20 .text drawDamageFog__10daPy_npc_cFv */