mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-25 16:32:04 +00:00
Code Issues Projects Releases Wiki Activity

rematch EnGo2_UpdateTalking a bit

Browse source
This commit is contained in:
feacur 2024-11-13 12:25:22 +01:00
parent da79fb473f
commit 1c416becd6
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -843,12 +843,21 @@ s16 EnGo2_UpdateTalkState(PlayState* play, Actor* thisx) {
} }
s32 EnGo2_UpdateTalking(EnGo2* this, PlayState* play) { s32 EnGo2_UpdateTalking(EnGo2* this, PlayState* play) {
if (ENGO2_GET_TYPE(this) != GORON_DMT_BIGGORON && ENGO2_GET_TYPE(this) != GORON_CITY_ROLLING_BIG) { // default:
return Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->interactRange, if (ENGO2_GET_TYPE(this) != GORON_DMT_BIGGORON) {
EnGo2_GetTextId, EnGo2_UpdateTalkState); if (ENGO2_GET_TYPE(this) != GORON_CITY_ROLLING_BIG) {
} else if ((ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) && !(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) { return Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->interactRange,
EnGo2_GetTextId, EnGo2_UpdateTalkState);
}
}
// `GORON_DMT_BIGGORON`, attention wasn't drawn
if ((ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) && !(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) {
return false; return false;
} else { }
// `GORON_DMT_BIGGORON` || `GORON_CITY_ROLLING_BIG`
{
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;
return true; return true;
@ -1830,7 +1839,7 @@ void EnGo2_HandleOffer(EnGo2* this, PlayState* play) {
#endif #endif
this->actionFunc = EnGo2_HandleOfferParented; this->actionFunc = EnGo2_HandleOfferParented;
} else { } else {
// @redundant: this action is always paired with `EnGo2_OfferItem`, which itself calls Actor_OfferGetItem // @redundant: this action is always paired with `EnGo2_OfferItem`, which itself calls `Actor_OfferGetItem`
Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f); fabsf(this->actor.yDistToPlayer) + 1.0f);
} }