mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 20:05:02 +00:00
Code Issues Projects Releases Wiki Activity

Minor Misc Cleanup 2 (#1422)

Browse source 
* misc cleanup

* more cleanup

* more cleanup

* PR Suggestions

* cleanup cond
This commit is contained in:
engineer124 2023-02-26 15:48:42 -05:00 • committed by GitHub
parent d4a6b21d46
commit 35887e25ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 174 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_collision_check.c
View file

@ -3537,7 +3537,7 @@ s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* a
return 0;
}
if (intersect2 == false) {
if (!intersect2) {
if (frac1 < 0.0f || 1.0f < frac1) {
return 0;
}
@ -3564,7 +3564,7 @@ s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* a
((frac2 * itemStep.y + actorToItem.y < 0.0f) || (height < frac2 * itemStep.y + actorToItem.y))) {
intersect2 = false;
}
if (intersect1 == false && intersect2 == false) {
if (!intersect1 && !intersect2) {
return 0;
} else if ((intersect1 == true) && (intersect2 == true)) {
out1->x = frac1 * itemStep.x + actorToItem.x + actorPos->x;