mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-06 18:50:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name Talking Related Actor Flags (#1733)

Browse Source 
* talk actor flags

* fix order

* remove comment
This commit is contained in:
engineer124
2024-10-24 11:12:41 +11:00
committed by GitHub
parent 19495ba8e9
commit 5a958cad4d
51 changed files with 199 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_sub_s.c
+3 -3
View File
@@ -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;