diff options
| author | fig02 <fig02srl@gmail.com> | 2025-04-26 19:07:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-26 19:07:52 -0400 |
| commit | ea22c2ac38bb8cbb459210ce868398c5e7bdcda4 (patch) | |
| tree | 17baba3cb29c16e3abae60e840e40e902d0108c1 /src/code/z_actor.c | |
| parent | bed76a3bf3cd89456e3331b2c2b50dbc5f79fe48 (diff) | |
create ACTOR_FLAGS_CHECK_ALL (#2515)
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 8ea0eb113..202b2e232 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -596,7 +596,7 @@ void Attention_Update(Attention* attention, Player* player, Actor* playerFocusAc attention->reticleFadeAlphaControl = 0; } - lockOnSfxId = CHECK_FLAG_ALL(playerFocusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) + lockOnSfxId = ACTOR_FLAGS_CHECK_ALL(playerFocusActor, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) ? NA_SE_SY_LOCK_ON : NA_SE_SY_LOCK_ON_HUMAN; Sfx_PlaySfxCentered(lockOnSfxId); @@ -3468,9 +3468,9 @@ void Attention_FindActorInCategory(PlayState* play, ActorContext* actorCtx, Play while (actor != NULL) { if ((actor->update != NULL) && ((Player*)actor != player) && - CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED)) { + ACTOR_FLAGS_CHECK_ALL(actor, ACTOR_FLAG_ATTENTION_ENABLED)) { if ((actorCategory == ACTORCAT_ENEMY) && - CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) && + ACTOR_FLAGS_CHECK_ALL(actor, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) && (actor->xyzDistToPlayerSq < SQ(500.0f)) && (actor->xyzDistToPlayerSq < sBgmEnemyDistSq)) { actorCtx->attention.bgmEnemy = actor; sBgmEnemyDistSq = actor->xyzDistToPlayerSq; |