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

clean up func_80061274

This commit is contained in:
mzxrules 2020-04-01 18:29:37 -04:00
parent 2ccba47ec4
commit a54c409554
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/code/z_collision_check.c
View File

@ -1111,7 +1111,7 @@ void func_800611A0(GlobalContext* globalCtx, CollisionCheckContext* check) {
temp = *col;
if (temp != NULL) {
if (temp->collideFlags & 1) {
if ((temp->actor == 0) || (temp->actor->update != NULL)) {
if (temp->actor == NULL || temp->actor->update != NULL) {
(*D_8011DF5C[temp->type])(globalCtx, check, temp);
}
}
@ -1126,20 +1126,26 @@ void func_80061274(GlobalContext* globalCtx, CollisionCheckContext* check, Colli
for (col = check->colAc; col < check->colAc + check->colAcCount; col++) {
temp = *col;
if (temp != NULL) {
if (temp->collideFlags & 1) {
if ((temp->actor == 0) || (temp->actor->update != 0)) {
if ((temp->collideFlags & collider->colliderFlags) & 0x38) {
if (collider != temp) {
if ((((collider->colliderFlags & 0x40) != 0) || (collider->actor == NULL)) || (temp->actor != collider->actor)) {
if (temp == NULL) {
continue;
}
else if (!(temp->collideFlags & 1)) {
continue;
}
else if (temp->actor != NULL && temp->actor->update == NULL) {
continue;
}
else if (!((temp->collideFlags & collider->colliderFlags) & 0x38)) {
continue;
}
else if (collider == temp) {
continue;
}
else if ((collider->colliderFlags & 0x40) || collider->actor == NULL || temp->actor != collider->actor) {
(*D_8011DF6C[collider->type][temp->type])(globalCtx, check, collider, temp);
}
}
}
}
}
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8006139C.s")