mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-15 04:36:59 +00:00
Code Issues Projects Releases Wiki Activity

Turn another sus construction into a switch

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

11
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -579,8 +579,8 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) {
if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) { if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) {
this->collider.base.acFlags &= ~AC_HIT; this->collider.base.acFlags &= ~AC_HIT;
if (this->actor.colChkInfo.damageEffect != 0) { switch (this->actor.colChkInfo.damageEffect) {
if (this->actor.colChkInfo.damageEffect == 0xF) { case 0xF:
effectPos.x = this->collider.info.bumper.hitPos.x; effectPos.x = this->collider.info.bumper.hitPos.x;
effectPos.y = this->collider.info.bumper.hitPos.y; effectPos.y = this->collider.info.bumper.hitPos.y;
effectPos.z = this->collider.info.bumper.hitPos.z; effectPos.z = this->collider.info.bumper.hitPos.z;
@ -612,11 +612,14 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) {
} }
EnSkj_SetupDie(this); EnSkj_SetupDie(this);
return 1; return 1;
}
} else { case 0:
this->backflipFlag = 1; this->backflipFlag = 1;
EnSkj_Backflip(this); EnSkj_Backflip(this);
return 1; return 1;
default:
break;
} }
} }
return 0; return 0;