mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-31 09:30:47 -04:00
Code Issues Packages 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
62 changed files with 174 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_collision_check.c
+2 -2
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;