mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

istargeted -> islockedon (#2132)

Browse source
This commit is contained in:
fig02 2024-09-04 19:26:23 -04:00 • committed by GitHub
parent dc469461a9
commit 6051251c92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/code/z_actor.c
View file

@ -1680,7 +1680,7 @@ s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 xzRange, f32 yRan
Player* player = GET_PLAYER(play);
if ((player->actor.flags & ACTOR_FLAG_TALK) || ((exchangeItemId != EXCH_ITEM_NONE) && Player_InCsMode(play)) ||
(!actor->isTargeted &&
(!actor->isLockedOn &&
((yRange < fabsf(actor->yDistToPlayer)) || (player->talkActorDistance < actor->xzDistToPlayer) ||
(xzRange < actor->xzDistToPlayer)))) {
return false;
@ -2334,9 +2334,9 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
if ((DECR(actor->freezeTimer) == 0) && (actor->flags & (ACTOR_FLAG_4 | ACTOR_FLAG_6))) {
if (actor == player->focusActor) {
actor->isTargeted = true;
actor->isLockedOn = true;
} else {
actor->isTargeted = false;
actor->isLockedOn = false;
}
if ((actor->targetPriority != 0) && (player->focusActor == NULL)) {
@ -3745,12 +3745,12 @@ s16 Actor_TestFloorInDirection(Actor* actor, PlayState* play, f32 distance, s16
}
/**
* Returns true if the player is targeting the provided actor
* Returns true if the player is locked onto the specified actor
*/
s32 Actor_IsTargeted(PlayState* play, Actor* actor) {
s32 Actor_IsLockedOn(PlayState* play, Actor* actor) {
Player* player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_4) && actor->isTargeted) {
if ((player->stateFlags1 & PLAYER_STATE1_4) && actor->isLockedOn) {
return true;
} else {
return false;
@ -3758,12 +3758,12 @@ s32 Actor_IsTargeted(PlayState* play, Actor* actor) {
}
/**
* Returns true if the player is targeting an actor other than the provided actor
* Returns true if the player is locked onto an actor other than the specified actor
*/
s32 Actor_OtherIsTargeted(PlayState* play, Actor* actor) {
s32 Actor_OtherIsLockedOn(PlayState* play, Actor* actor) {
Player* player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_4) && !actor->isTargeted) {
if ((player->stateFlags1 & PLAYER_STATE1_4) && !actor->isLockedOn) {
return true;
} else {
return false;
@ -5904,7 +5904,7 @@ s32 func_80037D98(PlayState* play, Actor* actor, s16 arg2, s32* arg3) {
return false;
}
if ((actor->xyzDistToPlayerSq > SQ(160.0f)) && !actor->isTargeted) {
if ((actor->xyzDistToPlayerSq > SQ(160.0f)) && !actor->isLockedOn) {
return false;
}