mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31: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

4
src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -235,7 +235,7 @@ void EnCs_HandleTalking(EnCs* this, PlayState* play) {
this->talkState = 1;
} else if (this->talkState == 1) {
this->talkState = EnCs_GetTalkState(this, play);
} else if (Actor_ProcessTalkRequest(&this->actor, play)) {
} else if (Actor_TalkOfferAccepted(&this->actor, play)) {
if ((this->actor.textId == 0x2022) || ((this->actor.textId != 0x2022) && (this->actor.textId != 0x2028))) {
EnCs_ChangeAnim(this, ENCS_ANIM_3, &this->currentAnimIndex);
}
@ -253,7 +253,7 @@ void EnCs_HandleTalking(EnCs* this, PlayState* play) {
Actor_GetScreenPos(play, &this->actor, &sp2A, &sp28);
if ((sp2A >= 0) && (sp2A <= 320) && (sp28 >= 0) && (sp28 <= 240) &&
(func_8002F2CC(&this->actor, play, 100.0f))) {
(Actor_OfferTalk(&this->actor, play, 100.0f))) {
this->actor.textId = EnCs_GetTextID(this, play);
}
}