izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Angie
2023-10-19 09:52:43 -03:00
parent 9c09615203
commit 784532df05
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+28 -28
View File
@@ -3331,6 +3331,34 @@ void EnAn_Destroy(Actor* thisx, PlayState* play) {
void EnAn_Update(Actor* thisx, PlayState* play) {
EnAn* this = THIS;
if (EnAn_InitializeObjectSlots(this, play)) {
return;
}
if ((this->actionFunc != EnAn_Initialize) && !EnAn_CheckTalk(this, play) &&
EnAn_IsCouplesMaskCsPlaying(this, play)) {
EnAn_HandleCouplesMaskCutscene(this, play);
EnAn_UpdateSkel(this, play);
EnAn_UpdateFace(this);
return;
}
this->actionFunc(this, play);
if (this->scheduleResult != ANJU_SCH_NONE) {
EnAn_HandleDialogue(this, play);
EnAn_UpdateSkel(this, play);
EnAn_UpdateFace(this);
EnAn_UpdateAttention(this);
SubS_Offer(&this->actor, play, this->unk_374, 30.0f, 0, this->stateFlags & SUBS_OFFER_MODE_MASK);
if (!(this->stateFlags & ENAN_STATE_IGNORE_GRAVITY)) {
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, UPDBGCHECKINFO_FLAG_4);
}
EnAn_UpdateCollider(this, play);
}
#if DEBUG_PRINT
{
Input* input = CONTROLLER1(&play->state);
@@ -3360,34 +3388,6 @@ void EnAn_Update(Actor* thisx, PlayState* play) {
}
#endif
if (EnAn_InitializeObjectSlots(this, play)) {
return;
}
if ((this->actionFunc != EnAn_Initialize) && !EnAn_CheckTalk(this, play) &&
EnAn_IsCouplesMaskCsPlaying(this, play)) {
EnAn_HandleCouplesMaskCutscene(this, play);
EnAn_UpdateSkel(this, play);
EnAn_UpdateFace(this);
return;
}
this->actionFunc(this, play);
if (this->scheduleResult != ANJU_SCH_NONE) {
EnAn_HandleDialogue(this, play);
EnAn_UpdateSkel(this, play);
EnAn_UpdateFace(this);
EnAn_UpdateAttention(this);
SubS_Offer(&this->actor, play, this->unk_374, 30.0f, 0, this->stateFlags & SUBS_OFFER_MODE_MASK);
if (!(this->stateFlags & ENAN_STATE_IGNORE_GRAVITY)) {
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, UPDBGCHECKINFO_FLAG_4);
}
EnAn_UpdateCollider(this, play);
}
#if DEBUG_PRINT
{
Input* input = CONTROLLER1(&play->state);