summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_bst.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-09-18 20:17:27 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-09-18 20:17:27 -0400
commit048d242eef520cc257914cbc56c009ea8e8dc130 (patch)
tree073a8dd8a9af0cdb2edb39eca8735ae2dd73db16 /src/d/actor/d_a_bst.cpp
parentae94c57e7398b0e1c65970cae062caaa58377880 (diff)
bpw partial cleanup, fix inline usage across several actors
Diffstat (limited to 'src/d/actor/d_a_bst.cpp')
-rw-r--r--src/d/actor/d_a_bst.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp
index 1b661d3b..227df915 100644
--- a/src/d/actor/d_a_bst.cpp
+++ b/src/d/actor/d_a_bst.cpp
@@ -1174,15 +1174,14 @@ static void head_damage(bst_class* i_this) {
cLib_addCalc2(&bomb->current.pos.y, actor->current.pos.y + 90.0f + REG0_F(0xb), 1.0f, 30.0f);
cLib_addCalc2(&bomb->current.pos.z, actor->current.pos.z, 1.0f, 30.0f);
}
- if (i_this->m10FC[0] == 0) {
- anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
- i_this->mDamage++;
- i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81E3, &actor->current.pos);
- fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
- i_this->m10FC[0] = 0x3c;
- } else {
+ if (i_this->m10FC[0] != 0) {
break;
}
+ anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
+ i_this->mDamage++;
+ i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81E3, &actor->current.pos);
+ fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
+ i_this->m10FC[0] = 0x3c;
// fallthrough
}
case 5: