mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

Name Talking Related Actor Flags (#2230)

Browse source 
* document talking related actor flags

* tweak comment

* review

* tweak

* accept -> accepted

* add more clarification
This commit is contained in:
fig02 2024-09-30 06:24:43 -04:00 • committed by GitHub
parent f7f38ff874
commit 80ed596c56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 84 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -53,7 +53,7 @@ void EnDs_Destroy(Actor* thisx, PlayState* play) {
void EnDs_Talk(EnDs* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actionFunc = EnDs_Wait;
this->actor.flags &= ~ACTOR_FLAG_16;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
this->unk_1E8 |= 1;
}
@ -70,7 +70,7 @@ void EnDs_TalkAfterGiveOddPotion(EnDs* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
this->actionFunc = EnDs_Talk;
} else {
this->actor.flags |= ACTOR_FLAG_16;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 1000.0f);
}
}
@ -188,7 +188,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
return;
case 2: // have 100 rupees and empty bottle
Rupees_ChangeBy(-100);
this->actor.flags &= ~ACTOR_FLAG_16;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferGetItem(&this->actor, play, GI_BOTTLE_POTION_BLUE, 10000.0f, 50.0f);
this->actionFunc = EnDs_GiveBluePotion;
return;