mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 22:41:14 +00:00
Name Talking Related Actor Flags (#2230)
* document talking related actor flags * tweak comment * review * tweak * accept -> accepted * add more clarification
This commit is contained in:
parent
f7f38ff874
commit
80ed596c56
25 changed files with 84 additions and 76 deletions
|
@ -1397,7 +1397,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
|
|||
}
|
||||
} else if (player->naviTextId < 0) {
|
||||
// trigger dialog instantly for negative message IDs
|
||||
thisx->flags |= ACTOR_FLAG_16;
|
||||
thisx->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
|
||||
}
|
||||
|
||||
if (Actor_TalkOfferAccepted(thisx, play)) {
|
||||
|
@ -1418,7 +1418,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
|
|||
this->elfMsg->actor.flags |= ACTOR_FLAG_TALK;
|
||||
}
|
||||
|
||||
thisx->flags &= ~ACTOR_FLAG_16;
|
||||
thisx->flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
|
||||
} else {
|
||||
this->actionFunc(this, play);
|
||||
thisx->shape.rot.y = this->unk_2BC;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue