mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-04 16:55:56 +00:00
Code Issues Projects Releases Wiki Activity

rename flag temp2 -> canUpdateTalking

Browse source
This commit is contained in:
feacur 2024-11-06 22:16:16 +01:00
parent 8c7182b3ab
commit e2b1da9bc1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -556,7 +556,7 @@ void EnMd_UpdateTalking(EnMd* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
s16 absYawDiff; s16 absYawDiff;
s16 trackingMode; s16 trackingMode;
s16 temp2; s16 canUpdateTalking;
s16 yawDiff; s16 yawDiff;
if (this->actor.xzDistToPlayer < 170.0f) { if (this->actor.xzDistToPlayer < 170.0f) {
@ -565,10 +565,10 @@ void EnMd_UpdateTalking(EnMd* this, PlayState* play) {
trackingMode = trackingMode =
absYawDiff <= Npc_GetTrackingPresetMaxPlayerYaw(2) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; absYawDiff <= Npc_GetTrackingPresetMaxPlayerYaw(2) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE;
temp2 = 1; canUpdateTalking = true;
} else { } else {
trackingMode = NPC_TRACKING_NONE; trackingMode = NPC_TRACKING_NONE;
temp2 = 0; canUpdateTalking = false;
} }
if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
@ -577,11 +577,11 @@ void EnMd_UpdateTalking(EnMd* this, PlayState* play) {
if (this->actionFunc == EnMd_Walk) { if (this->actionFunc == EnMd_Walk) {
trackingMode = NPC_TRACKING_NONE; trackingMode = NPC_TRACKING_NONE;
temp2 = 0; canUpdateTalking = false;
} }
if (this->actionFunc == EnMd_Watch) { if (this->actionFunc == EnMd_Watch) {
trackingMode = NPC_TRACKING_FULL_BODY; trackingMode = NPC_TRACKING_FULL_BODY;
temp2 = 1; canUpdateTalking = true;
} }
if ((play->csCtx.state != CS_STATE_IDLE) || gDebugCamEnabled) { if ((play->csCtx.state != CS_STATE_IDLE) || gDebugCamEnabled) {
@ -595,7 +595,7 @@ void EnMd_UpdateTalking(EnMd* this, PlayState* play) {
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode);
if (this->actionFunc != EnMd_ListenToOcarina) { if (this->actionFunc != EnMd_ListenToOcarina) {
if (temp2) { if (canUpdateTalking) {
Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f, Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f,
EnMd_GetTextId, EnMd_UpdateTalkState); EnMd_GetTextId, EnMd_UpdateTalkState);
} }