From f8ee0c8c1e99179bf1f27ab72af20f8aeb9d7f0f Mon Sep 17 00:00:00 2001
From: Cheezepin <cheezepin@gmail.com>
Date: Thu, 6 May 2021 16:06:18 -0700
Subject: [PATCH] i hate this

---
 src/engine/surface_collision.c | 28 +++-------------------------
 src/game/mario_step.c          |  4 ++--
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c
index bdb73c18..7f746705 100644
--- a/src/engine/surface_collision.c
+++ b/src/engine/surface_collision.c
@@ -55,7 +55,7 @@ static s32 find_wall_collisions_from_list(struct SurfaceNode *surfaceNode,
 
         offset = surf->normal.x * x + surf->normal.y * y + surf->normal.z * z + surf->originOffset;
 
-        if (offset < /*-radius*/ 0 || offset > radius) {
+        if (offset < -radius || offset > radius) {
             continue;
         }
 
@@ -343,43 +343,23 @@ s32 find_wall_collisions(struct WallCollisionData *colData) {
  *                     CEILINGS                   *
  **************************************************/
 
-void add_ceil_margin(s32 *x, s32 *z, Vec3s target1, Vec3s target2, f32 margin) {
-	register f32 diff_x, diff_z, invDenom;
-    f32 newX = (f32)*x;
-    f32 newZ = (f32)*z;
-    
-	diff_x = target1[0] - newX + target2[0] - newX;
-	diff_z = target1[2] - newZ + target2[2] - newZ;
-	invDenom = margin / sqrtf(diff_x * diff_x + diff_z * diff_z);
-	*x += diff_x * invDenom;
-	*z += diff_z * invDenom;
-}
 /**
  * Iterate through the list of ceilings and find the first ceiling over a given point.
  */
 static struct Surface *find_ceil_from_list(struct SurfaceNode *surfaceNode, s32 x, s32 y, s32 z, f32 *pheight) {
     register struct Surface *surf;
-    s32 x1, z1, x2, z2, x3, z3;
+    register s32 x1, z1, x2, z2, x3, z3;
     f32 nx, ny, nz, oo, height;
     struct Surface *ceil = NULL;
     *pheight = CELL_HEIGHT_LIMIT;
-    f32 newHeight;
-	const f32 margin = 1.5f;
-
-    ceil = NULL;
-
     // Stay in this loop until out of ceilings.
     while (surfaceNode != NULL) {
         surf = surfaceNode->surface;
         surfaceNode = surfaceNode->next;
         x1 = surf->vertex1[0];
         z1 = surf->vertex1[2];
-        if (surf->type != SURFACE_HANGABLE)
-			add_ceil_margin(&x1, &z1, surf->vertex2, surf->vertex3, margin);
         z2 = surf->vertex2[2];
         x2 = surf->vertex2[0];
-        if (surf->type != SURFACE_HANGABLE)
-			add_ceil_margin(&x2, &z2, surf->vertex3, surf->vertex1, margin);
         // Checking if point is in bounds of the triangle laterally.
         if ((z1 - z) * (x2 - x1) - (x1 - x) * (z2 - z1) > 0) {
             continue;
@@ -387,8 +367,6 @@ static struct Surface *find_ceil_from_list(struct SurfaceNode *surfaceNode, s32
         // Slight optimization by checking these later.
         x3 = surf->vertex3[0];
         z3 = surf->vertex3[2];
-        if (surf->type != SURFACE_HANGABLE)
-			add_ceil_margin(&x3, &z3, surf->vertex1, surf->vertex2, margin);
         if ((z2 - z) * (x3 - x2) - (x2 - x) * (z3 - z2) > 0) {
             continue;
         }
@@ -419,7 +397,7 @@ static struct Surface *find_ceil_from_list(struct SurfaceNode *surfaceNode, s32
 			continue;
 		}
 		// Checks for ceiling interaction
-		if (/*y > height*/ y - (height - -78.0f) > 0.0f) {
+		if (y > height) {
 			continue;
 		}
 		if (y >= surf->upperY) {
diff --git a/src/game/mario_step.c b/src/game/mario_step.c
index 54bb40f2..85d37afc 100644
--- a/src/game/mario_step.c
+++ b/src/game/mario_step.c
@@ -394,7 +394,7 @@ struct Surface *check_ledge_grab(struct MarioState *m, struct Surface *grabbedWa
     // a higher ledge than expected (glitchy ledge grab)
     ledgePos[0] = nextPos[0] - wall->normal.x * 60.0f;
     ledgePos[2] = nextPos[2] - wall->normal.z * 60.0f;
-    ledgePos[1] = find_floor(ledgePos[0], nextPos[1] + 160.0f, ledgePos[2], &ledgeFloor);
+    ledgePos[1] = find_floor(ledgePos[0], nextPos[1] + 160.0f, ledgePos[2], ledgeFloor);
 
     if (ledgePos[1] - nextPos[1] <= 100.0f) {
         return grabbedWall;
@@ -490,7 +490,7 @@ s32 perform_air_quarter_step(struct MarioState *m, Vec3f intendedPos, u32 stepAr
 
     waterLevel = find_water_level(nextPos[0], nextPos[2]);
 
-    m->wall = NULL;
+    //m->wall = NULL;
 
     //! The water pseudo floor is not referenced when your intended qstep is
     // out of bounds, so it won't detect you as landing.