From 1ea1f525d9754d9c3e70693d6b98af77bdd8dd33 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 30 Mar 2019 19:36:32 +0000
Subject: [PATCH] Fix editor clipping issue

git-svn-id: https://svn.eduke32.com/eduke32@7467 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/build/src/clip.cpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp
index 3bd76c8fe..4fffac53f 100644
--- a/source/build/src/clip.cpp
+++ b/source/build/src/clip.cpp
@@ -909,22 +909,19 @@ static int32_t get_floorspr_clipyou(int32_t x1, int32_t x2, int32_t x3, int32_t
     return clipyou;
 }
 
-static int sectoradjacent(int const sect1, int const sect2)
+#if 0
+static int sectoradjacent(int sect1, int sect2)
 {
-    if (sector[sect1].wallnum < sector[sect2].wallnum)
-    {
-        for (int i = 0; i < sector[sect1].wallnum; i++)
-            if (wall[sector[sect1].wallptr+i].nextsector == sect2)
-                return 1;
-    }
-    else
-    {
-        for (int i = 0; i < sector[sect2].wallnum; i++)
-            if (wall[sector[sect2].wallptr+i].nextsector == sect1)
-                return 1;
-    }
+    if (sector[sect1].wallnum > sector[sect2].wallnum)
+        swaplong(&sect1, &sect2);
+
+    for (int i = 0; i < sector[sect1].wallnum; i++)
+        if (wall[sector[sect1].wallptr+i].nextsector == sect2)
+            return 1;
+
     return 0;
 }
+#endif
 
 //
 // clipmove
@@ -1147,7 +1144,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect,
             if (clipsprite_try(spr, clipMin.x, clipMin.y, clipMax.x, clipMax.y))
                 continue;
 #endif
-            vec2_t p1 = *(vec2_t *)spr;
+            vec2_t p1 = *(vec2_t const *)spr;
 
             switch (cstat & (CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_ALIGNMENT_FLOOR))
             {
@@ -1307,7 +1304,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect,
         int const osectnum = *sectnum;
         updatesectorz(vec.x, vec.y, pos->z, sectnum);
 
-        if (*sectnum == osectnum || (*sectnum != -1 && !check_floor_curb(osectnum, *sectnum, flordist, pos->z, vec.x, vec.y)))
+        if (*sectnum == osectnum || editstatus || (*sectnum != -1 && !check_floor_curb(osectnum, *sectnum, flordist, pos->z, vec.x, vec.y)))
         {
             pos->x = vec.x;
             pos->y = vec.y;