diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-20 03:11:59 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 11:11:59 -0500 |
| commit | 3d1ee33d7b7799cd84c3bbe1fc8d4f69ec3f58d9 (patch) | |
| tree | 21178a693db198c0ca04a3fe3d0061c3c6915de5 /src/code/z_en_a_keep.c | |
| parent | c11ce9c99473be1ff1eba565e7eae920612586c3 (diff) | |
Document Actor "OfferTalk" (#1567)
* 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
Diffstat (limited to 'src/code/z_en_a_keep.c')
| -rw-r--r-- | src/code/z_en_a_keep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index d0b050868..118f0f3d9 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -204,10 +204,10 @@ void EnAObj_WaitTalk(EnAObj* this, PlayState* play) { relYawTowardsPlayer = this->dyna.actor.yawTowardsPlayer - this->dyna.actor.shape.rot.y; if (ABS(relYawTowardsPlayer) < 0x2800 || (this->dyna.actor.params == A_OBJ_SIGNPOST_ARROW && ABS(relYawTowardsPlayer) > 0x5800)) { - if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) { + if (Actor_TalkOfferAccepted(&this->dyna.actor, play)) { EnAObj_SetupAction(this, EnAObj_WaitFinishedTalking); } else { - func_8002F2F4(&this->dyna.actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->dyna.actor, play); } } } |