Skip to content

Commit

Permalink
coll progress
Browse files Browse the repository at this point in the history
  • Loading branch information
Niko committed Feb 23, 2025
1 parent bf9ed2e commit f57517c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ghidra/COLL.c
Original file line number Diff line number Diff line change
Expand Up @@ -3760,8 +3760,12 @@ void FUN_80020410(undefined4 param_1,int param_2)
}
}
}

// if LInC returns collision,
// if BSP->flag = instance hitbox
if ((iVar5 == 2) || (DAT_1f800150[1] == 4))
{
// add to array of BSPs collided with instance hitboxes
*(byte **)(&DAT_1f800190 + DAT_1f8001cc) = DAT_1f800150;
DAT_1f8001cc = DAT_1f8001cc + 1;
}
Expand All @@ -3779,11 +3783,13 @@ void FUN_80020410(undefined4 param_1,int param_2)
// VehAfterColl_GetSurface
uVar8 = FUN_80057c44((uint)DAT_1f800150[1]);

// if BSP->flag = instance hitbox
if ((DAT_1f800150[1] == 4) ||

// COLL_Scrub
(iVar5 = FUN_80020c58(param_2,param_1,&DAT_1f800108,uVar8,param_2 + 0x88), iVar5 == 0)) {

// add to array of BSPs collided with instance hitboxes
*(byte **)(&DAT_1f800190 + DAT_1f8001cc) = DAT_1f800150;
DAT_1f8001cc = DAT_1f8001cc + 1;
}
Expand Down

0 comments on commit f57517c

Please sign in to comment.