mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 11:54:39 +00:00
Code Issues Projects Releases Wiki Activity

tweak EnGo2_UpdateTalking code and comments

Browse source 
https://github.com/zeldaret/oot/pull/2295#discussion_r1841205108
https://github.com/zeldaret/oot/pull/2295#discussion_r1841210644
https://github.com/zeldaret/oot/pull/2295#discussion_r1841256344
https://github.com/zeldaret/oot/pull/2295#discussion_r1841268480
This commit is contained in:
feacur 2024-11-14 01:10:38 +01:00
parent e87bc05aff
commit 1fa1922a9b
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -843,22 +843,17 @@ s16 EnGo2_UpdateTalkState(PlayState* play, Actor* thisx) {
} }
s32 EnGo2_UpdateTalking(EnGo2* this, PlayState* play) { s32 EnGo2_UpdateTalking(EnGo2* this, PlayState* play) {
// default: if (ENGO2_GET_TYPE(this) != GORON_DMT_BIGGORON && ENGO2_GET_TYPE(this) != GORON_CITY_HOT_RODDER) {
if (ENGO2_GET_TYPE(this) != GORON_DMT_BIGGORON) {
if (ENGO2_GET_TYPE(this) != GORON_CITY_HOT_RODDER) {
return Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->interactRange, return Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->interactRange,
EnGo2_GetTextId, EnGo2_UpdateTalkState); EnGo2_GetTextId, EnGo2_UpdateTalkState);
} }
}
// `GORON_DMT_BIGGORON`, close enough; see `EnGo2_IsInRange` // Biggoron is close enough; see `EnGo2_IsInRange`
if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) { if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON && !(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) {
if (!(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) {
return false; return false;
} }
}
// `GORON_DMT_BIGGORON` || `GORON_CITY_HOT_RODDER` // dialog with Biggoron or Hot Rodder
{ {
if (Actor_TalkOfferAccepted(&this->actor, play)) { if (Actor_TalkOfferAccepted(&this->actor, play)) {
this->interactInfo.talkState = NPC_TALK_STATE_TALKING; this->interactInfo.talkState = NPC_TALK_STATE_TALKING;