mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-03 18:36:00 -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_msgevent.c
+3 -3
View File
@@ -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;
}
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;