From 2526ae06f1a5dbbb1f6b88a9ff7633f9dd128916 Mon Sep 17 00:00:00 2001 From: Reonu Date: Wed, 28 Apr 2021 16:12:58 +0100 Subject: [PATCH] Fixed water surface type patch after the exposed ceiling fix messed with it --- src/engine/surface_collision.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c index 808930c5..8b28e708 100644 --- a/src/engine/surface_collision.c +++ b/src/engine/surface_collision.c @@ -252,12 +252,12 @@ static struct Surface *find_ceil_from_list(struct SurfaceNode *surfaceNode, s32 } // Determine if checking for the camera or not. if (gCheckingSurfaceCollisionsForCamera != 0) { - if (surf->flags & SURFACE_FLAG_NO_CAM_COLLISION) { + if (surf->flags & SURFACE_FLAG_NO_CAM_COLLISION || surf->type == SURFACE_NEW_WATER || surf->type == SURFACE_NEW_WATER_BOTTOM) { continue; } } // Ignore camera only surfaces. - else if (surf->type == SURFACE_CAMERA_BOUNDARY) { + else if (surf->type == SURFACE_CAMERA_BOUNDARY || surf->type == SURFACE_NEW_WATER || surf->type == SURFACE_NEW_WATER_BOTTOM) { continue; } nx = surf->normal.x; @@ -414,7 +414,7 @@ static struct Surface *find_floor_from_list(struct SurfaceNode *surfaceNode, s32 } // Determine if we are checking for the camera or not. if (gCheckingSurfaceCollisionsForCamera != 0) { - if (surf->flags & SURFACE_FLAG_NO_CAM_COLLISION) { + if (surf->flags & SURFACE_FLAG_NO_CAM_COLLISION || surf->type == SURFACE_NEW_WATER || surf->type == SURFACE_NEW_WATER_BOTTOM) { continue; } }