falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better match for BgKin2Fence_CheckHitMask (#1105) 

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Tom Overton 2022-10-04 12:23:13 -07:00 committed by GitHub
parent 6c414889c9
commit 8cd48db087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
View File

@ -120,19 +120,12 @@ static InitChainEntry sInitChain[] = {
};
s32 BgKin2Fence_CheckHitMask(BgKin2Fence* this) {
ColliderJntSphElement* elements = this->collider.elements;
s32 i;
if (elements[0].info.bumperFlags & BUMP_HIT) {
return 0;
}
if (elements[1].info.bumperFlags & BUMP_HIT) {
return 1;
}
if (elements[2].info.bumperFlags & BUMP_HIT) {
return 2;
}
if (elements[3].info.bumperFlags & BUMP_HIT) {
return 3;
for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) {
if (this->collider.elements[i].info.bumperFlags & BUMP_HIT) {
return i;
}
}
return -1;
}