mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00
Code Issues Projects Releases Wiki Activity

Document Actor "OfferTalk" (#1567)

Browse source 
* OfferTalk

* rm comment

* exch to offer in comment

* reword again

* Partial PR Review

* Actor_AcknowledgeTalking

* Actor_TalkOfferAccepted

* PR Review

* rm part of comment

* rm comment
This commit is contained in:
engineer124 2023-11-20 03:11:59 +11:00 • committed by GitHub
parent c11ce9c994
commit 3d1ee33d7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 297 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -466,12 +466,12 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
void EnGe2_ForceTalk(EnGe2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
this->actionFunc = EnGe2_GiveCard;
} else {
this->actor.textId = 0x6004;
this->actor.flags |= ACTOR_FLAG_16;
func_8002F1C4(&this->actor, play, 300.0f, 300.0f, EXCH_ITEM_NONE);
Actor_OfferTalkExchange(&this->actor, play, 300.0f, 300.0f, EXCH_ITEM_NONE);
}
EnGe2_LookAtPlayer(this, play);
}
@ -519,7 +519,7 @@ void EnGe2_UpdateFriendly(Actor* thisx, PlayState* play) {
EnGe2_MaintainColliderAndSetAnimState(this, play);
this->actionFunc(this, play);
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
if ((this->actor.params & 0xFF) == GE2_TYPE_PATROLLING) {
this->actor.speed = 0.0f;
EnGe2_ChangeAction(this, GE2_ACTION_WAITLOOKATPLAYER);
@ -530,7 +530,7 @@ void EnGe2_UpdateFriendly(Actor* thisx, PlayState* play) {
this->actor.textId = 0x6005;
if (this->actor.xzDistToPlayer < 100.0f) {
func_8002F2CC(&this->actor, play, 100.0f);
Actor_OfferTalk(&this->actor, play, 100.0f);
}
}
EnGe2_MoveAndBlink(this, play);