mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 07:51:48 +00:00
Code Issues Projects Releases Wiki Activity

EnFz_ApplyDamage match fixup

Browse source
This commit is contained in:
Dragorn421 2022-10-05 12:47:55 +02:00
parent 1baa571f18
commit 3c34acbbf4
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/overlays/actors/ovl_En_Fz/z_en_fz.c
View file

@ -341,11 +341,11 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) {
this->collider1.base.acFlags &= ~AC_HIT; this->collider1.base.acFlags &= ~AC_HIT;
} else if (this->collider1.base.acFlags & AC_HIT) { } else if (this->collider1.base.acFlags & AC_HIT) {
this->collider1.base.acFlags &= ~AC_HIT; this->collider1.base.acFlags &= ~AC_HIT;
if (this->actor.colChkInfo.damageEffect != 2) { switch (this->actor.colChkInfo.damageEffect) {
if (this->actor.colChkInfo.damageEffect == 0xF) { case 0xF:
Actor_ApplyDamage(&this->actor); Actor_ApplyDamage(&this->actor);
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 8); Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 8);
if (this->actor.colChkInfo.health) { if (this->actor.colChkInfo.health != 0) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE);
vec.x = this->actor.world.pos.x; vec.x = this->actor.world.pos.x;
vec.y = this->actor.world.pos.y; vec.y = this->actor.world.pos.y;
@ -361,16 +361,21 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) {
EnFz_Damaged(this, play, &vec, 30, 10.0f); EnFz_Damaged(this, play, &vec, 30, 10.0f);
EnFz_SetupDespawn(this, play); EnFz_SetupDespawn(this, play);
} }
} break;
} else {
Actor_ApplyDamage(&this->actor); case 2:
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 8); Actor_ApplyDamage(&this->actor);
if (this->actor.colChkInfo.health == 0) { Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0x2000, 8);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DEAD); if (this->actor.colChkInfo.health == 0) {
EnFz_SetupMelt(this); Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DEAD);
} else { EnFz_SetupMelt(this);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE); } else {
} Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FREEZAD_DAMAGE);
}
break;
default:
break;
} }
} }
} }