mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 15:55:47 +00:00
Code Issues Projects Releases Wiki Activity

EnGo2_IsCameraModified -> EnGo2_ShouldStay

Browse source
This commit is contained in:
feacur 2024-11-13 12:26:33 +01:00
parent 1c416becd6
commit 35d0d71008
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -851,9 +851,11 @@ s32 EnGo2_UpdateTalking(EnGo2* this, PlayState* play) {
} }
} }
// `GORON_DMT_BIGGORON`, attention wasn't drawn // `GORON_DMT_BIGGORON`, attention wasn't drawn; see `EnGo2_IsAttentionDrawn`
if ((ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) && !(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) { if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) {
return false; if (!(this->collider.base.ocFlags2 & OC2_HIT_PLAYER)) {
return false;
}
} }
// `GORON_DMT_BIGGORON` || `GORON_CITY_ROLLING_BIG` // `GORON_DMT_BIGGORON` || `GORON_CITY_ROLLING_BIG`
@ -1199,7 +1201,7 @@ f32 EnGo2_GetTargetXZSpeed(EnGo2* this) {
} }
} }
s32 EnGo2_IsAttentionDrawnExtented(EnGo2* this, PlayState* play) { s32 EnGo2_ShouldStay(EnGo2* this, PlayState* play) {
Camera* mainCam = play->cameraPtrs[CAM_ID_MAIN]; Camera* mainCam = play->cameraPtrs[CAM_ID_MAIN];
if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) { if (ENGO2_GET_TYPE(this) == GORON_DMT_BIGGORON) {
@ -1734,7 +1736,7 @@ void EnGo2_Standing(EnGo2* this, PlayState* play) {
(s16)((height * 0.4f * (this->skelAnime.curFrame / this->skelAnime.endFrame)) + (height * 0.6f)); (s16)((height * 0.4f * (this->skelAnime.curFrame / this->skelAnime.endFrame)) + (height * 0.6f));
} }
} }
if ((!EnGo2_IsAttentionDrawnExtented(this, play)) && (!EnGo2_IsAttentionDrawn(this))) { if ((!EnGo2_ShouldStay(this, play)) && (!EnGo2_IsAttentionDrawn(this))) {
EnGo2_AnimateRolling(this, play); EnGo2_AnimateRolling(this, play);
} }
} }