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

Target -> Attention (System Rename) (#2149)

Browse source 
* TargetContext -> Attention

* targetCtx -> attention

* Target_ -> Attention_

* FindTargetableActor -> FindActor

* targetableActorP -> attentionActorP

* data vars (and 1 function I missed)

* targetMode -> attentionRangeType

* attention range enum comments

* ATTENTION_RANGE_

* attention range data

* TargetColor -> AttentionColor

* missed one

* fixup color variables

* targetArrowOffset -> lockOnArrowOffset

* focus pos comment

* targetPriority -> attentionPriority

* assets

* loose-ends

* Attention System Description

* format

* skj range type

* enemy bgm
This commit is contained in:
fig02 2024-09-07 09:23:04 -04:00 • committed by GitHub
parent a30f130eb9
commit 88c4475967
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
156 changed files with 497 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -138,21 +138,21 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
EnGe2_ChangeAction(this, GE2_ACTION_WALK);
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = TARGET_MODE_6;
this->actor.attentionRangeType = ATTENTION_RANGE_6;
}
break;
case GE2_TYPE_STATIONARY:
EnGe2_ChangeAction(this, GE2_ACTION_STAND);
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = TARGET_MODE_6;
this->actor.attentionRangeType = ATTENTION_RANGE_6;
}
break;
case GE2_TYPE_GERUDO_CARD_GIVER:
EnGe2_ChangeAction(this, GE2_ACTION_WAITLOOKATPLAYER);
this->actor.update = EnGe2_UpdateAfterTalk;
this->actionFunc = EnGe2_ForceTalk;
this->actor.targetMode = TARGET_MODE_6;
this->actor.attentionRangeType = ATTENTION_RANGE_6;
break;
default:
ASSERT(0, "0", "../z_en_ge2.c", 418);
@ -595,7 +595,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
if (EnGe2_CheckCarpentersFreed() && !(this->stateFlags & GE2_STATE_KO)) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = TARGET_MODE_6;
this->actor.attentionRangeType = ATTENTION_RANGE_6;
}
}
@ -621,7 +621,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) {
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = TARGET_MODE_6;
this->actor.attentionRangeType = ATTENTION_RANGE_6;
this->actor.colorFilterTimer = 0;
} else if (this->actor.colorFilterTimer == 0) {
this->actor.update = EnGe2_Update;