From 16f61800effd9a92a9118428f7df2883d40ca653 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 16 Sep 2022 19:11:57 +0200 Subject: [PATCH] - simplified code a bit in clipmove --- source/build/src/clip.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp index ec4948d14..bd46d90f1 100644 --- a/source/build/src/clip.cpp +++ b/source/build/src/clip.cpp @@ -402,13 +402,13 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect, for (int j=startwall; jpoint2Wall(); + vec2_t p1 = wal->wall_int_pos(); + vec2_t p2 = wal2->wall_int_pos(); - if ((wal->wall_int_pos().X < clipMin.X && wal2->wall_int_pos().X < clipMin.X) || (wal->wall_int_pos().X > clipMax.X && wal2->wall_int_pos().X > clipMax.X) || - (wal->wall_int_pos().Y < clipMin.Y && wal2->wall_int_pos().Y < clipMin.Y) || (wal->wall_int_pos().Y > clipMax.Y && wal2->wall_int_pos().Y > clipMax.Y)) + if ((p1.X < clipMin.X && p2.X < clipMin.X) || (p1.X > clipMax.X && p2.X > clipMax.X) || + (p1.Y < clipMin.Y && p2.Y < clipMin.Y) || (p1.Y > clipMax.Y && p2.Y > clipMax.Y)) continue; - vec2_t p1 = wal->wall_int_pos(); - vec2_t p2 = wal2->wall_int_pos(); vec2_t d = { p2.X-p1.X, p2.Y-p1.Y }; if (d.X * (pos->Y-p1.Y) < (pos->X-p1.X) * d.Y)