diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-10-24 11:12:41 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 11:12:41 +1100 |
| commit | 5a958cad4d5ee29bab345381fd2f366ad620beb1 (patch) | |
| tree | eb04a61f3ce048ae49238c1881294b42e314c5be /src/code | |
| parent | 19495ba8e94ca0ff492404ec263c4ca65e5b7115 (diff) | |
Name Talking Related Actor Flags (#1733)
* talk actor flags
* fix order
* remove comment
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_msgevent.c | 6 | ||||
| -rw-r--r-- | src/code/z_sub_s.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_msgevent.c b/src/code/z_msgevent.c index 109a511ea..94ee1af48 100644 --- a/src/code/z_msgevent.c +++ b/src/code/z_msgevent.c @@ -175,7 +175,7 @@ s32 MsgEvent_Autotalk(Actor* actor, PlayState* play, u8** script, MsgScriptCallb if (Actor_TalkOfferAccepted(actor, &play->state)) { *script += skip; } else { - actor->flags |= ACTOR_FLAG_10000; + actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; xzDist = actor->xzDistToPlayer; actor->xzDistToPlayer = 0.0f; Actor_OfferTalkExchange(actor, play, xzRange, yRange, PLAYER_IA_NONE); @@ -471,14 +471,14 @@ s32 MsgEvent_Pause(Actor* actor, PlayState* play, u8** script, MsgScriptCallback } /** - * Unsets ACTOR_FLAG_10000 for the actor executing the cmd + * Unsets ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED for the actor executing the cmd * * Command structure: * 0:(u8) cmd * Command size: 1 */ s32 MsgEvent_UnsetAutotalk(Actor* actor, PlayState* play, u8** script, MsgScriptCallback callback, s32* endScript) { - actor->flags &= ~ACTOR_FLAG_10000; + actor->flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; return false; } diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index f075883bb..28832cf6a 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -861,7 +861,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI xzRange = actor->xzDistToPlayer + 1.0f; xzDistToPlayerTemp = actor->xzDistToPlayer; actor->xzDistToPlayer = 0.0f; - actor->flags |= ACTOR_FLAG_10000; + actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId); actor->xzDistToPlayer = xzDistToPlayerTemp; break; @@ -871,7 +871,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI if (((screenPosX >= 0) || (screenPosX < SCREEN_WIDTH)) && ((screenPosY >= 0) || (screenPosY < SCREEN_HEIGHT)) && (fabsf(actor->playerHeightRel) <= yRange) && (actor->xzDistToPlayer <= xzRange) && actor->isLockedOn) { - actor->flags |= ACTOR_FLAG_10000; + actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId); } break; @@ -881,7 +881,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI if (((screenPosX >= 0) || (screenPosX < SCREEN_WIDTH)) && ((screenPosY >= 0) || (screenPosY < SCREEN_HEIGHT)) && (fabsf(actor->playerHeightRel) <= yRange) && (actor->xzDistToPlayer <= xzRange)) { - actor->flags |= ACTOR_FLAG_10000; + actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId); } break; |