diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-09-02 15:16:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 15:16:45 -0400 |
| commit | 9cceea48f31bdeea1c2933a1f64a74b60b80f17a (patch) | |
| tree | ce2bfd99dfc465574800930015fa0a4d987eeefd /src/code/z_sub_s.c | |
| parent | cbf9d98dba61924625629061f7680e3508fc2701 (diff) | |
Documentation pass for the Target system (#1281)
* cleanup
* import bss
* sActorHiliteMtx
* some cleanups on func_800BB604
* Actor_IsInTargetableRange
* rematch func_800BB604
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Name ACTOR_FLAG_UNFRIENDLY and ACTOR_FLAG_FRIENDLY
* Rename some Target_ functions
* cleanusp
* TargetMode enum
* Target_800B82EC
* sNaming
* more
* more naming
* fairyHintPos
* rotation
* ACTOR_FLAG_TARGETABLE
* update namefixer
* remove trailing comma
* bss
* Wall of text for Target_800BB604
* function naming
* cleanups
* Target_GetAdjustedDistSq
* NotLeash
* more comments
* minor comment
* review
* fix
* rotZTick
* review
* name last members
* fix
* review
* review
* more namefixer
* swap members
* comment
* Update src/code/z_actor.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_actor.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* format
* Update src/code/z_actor.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64actor.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* review
* fix
* fix
---------
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code/z_sub_s.c')
| -rw-r--r-- | src/code/z_sub_s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index 427cc85d0..4baff41ce 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -865,7 +865,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI case SUBS_OFFER_MODE_AUTO_TARGETED: //! @bug: Both x and y conditionals are always true, || should be an && if (((x >= 0) || (x < SCREEN_WIDTH)) && ((y >= 0) || (y < SCREEN_HEIGHT)) && - (fabsf(actor->playerHeightRel) <= yRange) && (actor->xzDistToPlayer <= xzRange) && actor->isTargeted) { + (fabsf(actor->playerHeightRel) <= yRange) && (actor->xzDistToPlayer <= xzRange) && actor->isLockedOn) { actor->flags |= ACTOR_FLAG_10000; canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId); } |